From 37cf6c428a0869c5caebbe4d908997225d762af9 Mon Sep 17 00:00:00 2001 From: nearbyplayer <3721216+nearbyplayer@users.noreply.github.com> Date: Sun, 24 Sep 2017 14:31:50 -0400 Subject: [PATCH 01/39] Initial commit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + 2 files changed, 675 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..9cecc1d4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 00000000..dc96414f --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# esx_rpchat \ No newline at end of file From 3874050028a030fcb256bcd274de12cf60ca5835 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sun, 24 Sep 2017 15:15:11 -0400 Subject: [PATCH 02/39] chore(Upload Files) Committed on behalf of AdrineX --- .editorconfig | 9 ++++++ README.md | 32 +++++++++++++++++++- __resource.lua | 20 +++++++++++++ client/main.lua | 38 ++++++++++++++++++++++++ server/main.lua | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 .editorconfig create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 server/main.lua diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..4bfca33b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/README.md b/README.md index dc96414f..0e96f479 100644 --- a/README.md +++ b/README.md @@ -1 +1,31 @@ -# esx_rpchat \ No newline at end of file +# esx_rpchat +FXServer ESX RP Chat + + +#### Description +This is a proximity chat script. With a few commands such as Twitter, OOC, Local Me, and Local Do. + +#### Requirements +- [esx_identity](https://github.com/ESX-Org/esx_identity) + +#### Download + +**1) Using [fvm](https://github.com/qlaffont/fvm-installer)** +``` +fvm install --save --folder=esx esx-org/esx_rpchat +``` + +**2) Manually** +- Download https://github.com/ESX-Org/esx_rpchat/releases/latest +- Put it in resource/[esx] directory + +**3) Using Git** + +``` +cd resouces +git clone https://github.com/ESX-Org/esx_rpchat +``` + +#### Installation + +1) Add `start esx_rpchat` to your server.cfg \ No newline at end of file diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..03ae3b2b --- /dev/null +++ b/__resource.lua @@ -0,0 +1,20 @@ +--[[ + + ESX RP Chat + +--]] + +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX RP Chat' + +version '1.0.0' + +client_script 'client/main.lua' + +server_scripts { + + '@mysql-async/lib/MySQL.lua', + 'server/main.lua' + +} diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..4ae97c33 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,38 @@ +--[[ + + ESX RP Chat + +--]] + +RegisterNetEvent('sendProximityMessage') +AddEventHandler('sendProximityMessage', function(id, name, message) + local myId = PlayerId() + local pid = GetPlayerFromServerId(id) + if pid == myId then + TriggerEvent('chatMessage', "^4" .. name .. "", {0, 153, 204}, "^7 " .. message) + elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(myId)), GetEntityCoords(GetPlayerPed(pid)), true) < 19.999 then + TriggerEvent('chatMessage', "^4" .. name .. "", {0, 153, 204}, "^7 " .. message) + end +end) + +RegisterNetEvent('sendProximityMessageMe') +AddEventHandler('sendProximityMessageMe', function(id, name, message) + local myId = PlayerId() + local pid = GetPlayerFromServerId(id) + if pid == myId then + TriggerEvent('chatMessage', "", {255, 0, 0}, " ^6 " .. name .." ".."^6 " .. message) + elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(myId)), GetEntityCoords(GetPlayerPed(pid)), true) < 19.999 then + TriggerEvent('chatMessage', "", {255, 0, 0}, " ^6 " .. name .." ".."^6 " .. message) + end +end) + +RegisterNetEvent('sendProximityMessageDo') +AddEventHandler('sendProximityMessageDo', function(id, name, message) + local myId = PlayerId() + local pid = GetPlayerFromServerId(id) + if pid == myId then + TriggerEvent('chatMessage', "", {255, 0, 0}, " ^0* " .. name .." ".."^0 " .. message) + elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(myId)), GetEntityCoords(GetPlayerPed(pid)), true) < 19.999 then + TriggerEvent('chatMessage', "", {255, 0, 0}, " ^0* " .. name .." ".."^0 " .. message) + end +end) diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..6288f5b0 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,78 @@ +--[[ + + ESX RP Chat + +--]] + +function getIdentity(source, callback) + local identifier = GetPlayerIdentifiers(source)[1] + MySQL.Async.fetchAll("SELECT * FROM `users` WHERE `identifier` = @identifier", {['@identifier'] = identifier}, + function(result) + if result[1]['firstname'] ~= nil then + local data = { + identifier = result[1]['identifier'], + firstname = result[1]['firstname'], + lastname = result[1]['lastname'], + dateofbirth = result[1]['dateofbirth'], + sex = result[1]['sex'], + height = result[1]['height'] + } + callback(data) + else + local data = { + identifier = '', + firstname = '', + lastname = '', + dateofbirth = '', + sex = '', + height = '' + } + callback(data) + end + end) +end + +AddEventHandler('chatMessage', function(source, name, message) + getIdentity(source, function(data) + if string.sub(message, 1, string.len("/")) ~= "/" then + TriggerClientEvent("sendProximityMessage", -1, source, data.firstname, message) + end + end) + CancelEvent() +end) + +TriggerEvent('es:addCommand', 'me', function(source, args, user) + table.remove(args, 1) + getIdentity(source, function(data) + TriggerClientEvent("sendProximityMessageMe", -1, source, data.firstname, table.concat(args, " ")) + end) +end) + +TriggerEvent('es:addCommand', 'do', function(source, args, user) + table.remove(args, 1) + getIdentity(source, function(data) + TriggerClientEvent("sendProximityMessageDo", -1, source, data.firstname, table.concat(args, " ")) + end) +end) + +TriggerEvent('es:addCommand', 'twt', function(source, args, user) + table.remove(args, 1) + TriggerClientEvent('chatMessage', -1, "^0[^4Twitter^0] (^5@" .. GetPlayerName(source) .. "^0)", {30, 144, 255}, table.concat(args, " ")) +end, {help = 'Send a tweet. [IC]'}) + +TriggerEvent('es:addCommand', 'ooc', function(source, args, user) + table.remove(args, 1) + TriggerClientEvent('chatMessage', -1, "OOC | " .. GetPlayerName(source), {128, 128, 128}, table.concat(args, " ")) +end, {help = 'Send an out of character message to the whole server.'}) + +function stringsplit(inputstr, sep) + if sep == nil then + sep = "%s" + end + local t={} ; i=1 + for str in string.gmatch(inputstr, "([^"..sep.."]+)") do + t[i] = str + i = i + 1 + end + return t +end From c56f9d21951709573550a1fefc3a8e5e70f51718 Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Sun, 26 Nov 2017 23:58:41 -0800 Subject: [PATCH 03/39] Updated for ES5 --- server/main.lua | 108 +++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 62 deletions(-) diff --git a/server/main.lua b/server/main.lua index 6288f5b0..3ca33399 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,75 +4,59 @@ --]] -function getIdentity(source, callback) - local identifier = GetPlayerIdentifiers(source)[1] - MySQL.Async.fetchAll("SELECT * FROM `users` WHERE `identifier` = @identifier", {['@identifier'] = identifier}, - function(result) - if result[1]['firstname'] ~= nil then - local data = { - identifier = result[1]['identifier'], - firstname = result[1]['firstname'], - lastname = result[1]['lastname'], - dateofbirth = result[1]['dateofbirth'], - sex = result[1]['sex'], - height = result[1]['height'] - } - callback(data) - else - local data = { - identifier = '', - firstname = '', - lastname = '', - dateofbirth = '', - sex = '', - height = '' - } - callback(data) - end - end) +function getIdentity(source) + local identifier = GetPlayerIdentifiers(source)[1] + local result = MySQL.Sync.fetchAll("SELECT * FROM users WHERE identifier = @identifier", {['@identifier'] = identifier}) + if result[1] ~= nil then + local identity = result[1] + + return { + identifier = identity['identifier'], + firstname = identity['firstname'], + lastname = identity['lastname'], + dateofbirth = identity['dateofbirth'], + sex = identity['sex'], + height = identity['height'] + } + else + return nil + end end -AddEventHandler('chatMessage', function(source, name, message) - getIdentity(source, function(data) - if string.sub(message, 1, string.len("/")) ~= "/" then - TriggerClientEvent("sendProximityMessage", -1, source, data.firstname, message) - end + AddEventHandler('chatMessage', function(source, name, message) + if string.sub(message, 1, string.len("/")) ~= "/" then + local name = getIdentity(source) + TriggerClientEvent("sendProximityMessage", -1, source, name.firstname, message) + end + CancelEvent() end) - CancelEvent() -end) -TriggerEvent('es:addCommand', 'me', function(source, args, user) - table.remove(args, 1) - getIdentity(source, function(data) - TriggerClientEvent("sendProximityMessageMe", -1, source, data.firstname, table.concat(args, " ")) - end) -end) + TriggerEvent('es:addCommand', 'me', function(source, args, user) + local name = getIdentity(source) + TriggerClientEvent("sendProximityMessageMe", -1, source, name.firstname, table.concat(args, " ")) + end) -TriggerEvent('es:addCommand', 'do', function(source, args, user) - table.remove(args, 1) - getIdentity(source, function(data) - TriggerClientEvent("sendProximityMessageDo", -1, source, data.firstname, table.concat(args, " ")) - end) -end) + TriggerEvent('es:addCommand', 'do', function(source, args, user) + local name = getIdentity(source) + TriggerClientEvent("sendProximityMessageDo", -1, source, name.firstname, table.concat(args, " ")) + end) -TriggerEvent('es:addCommand', 'twt', function(source, args, user) - table.remove(args, 1) - TriggerClientEvent('chatMessage', -1, "^0[^4Twitter^0] (^5@" .. GetPlayerName(source) .. "^0)", {30, 144, 255}, table.concat(args, " ")) -end, {help = 'Send a tweet. [IC]'}) + TriggerEvent('es:addCommand', 'twt', function(source, args, user) + TriggerClientEvent('chatMessage', -1, "^0[^4Twitter^0] (^5@" .. GetPlayerName(source) .. "^0)", {30, 144, 255}, table.concat(args, " ")) + end, {help = 'Send a tweet. [IC]'}) -TriggerEvent('es:addCommand', 'ooc', function(source, args, user) - table.remove(args, 1) - TriggerClientEvent('chatMessage', -1, "OOC | " .. GetPlayerName(source), {128, 128, 128}, table.concat(args, " ")) -end, {help = 'Send an out of character message to the whole server.'}) + TriggerEvent('es:addCommand', 'ooc', function(source, args, user) + TriggerClientEvent('chatMessage', -1, "OOC | " .. GetPlayerName(source), {128, 128, 128}, table.concat(args, " ")) + end, {help = 'Send an out of character message to the whole server.'}) function stringsplit(inputstr, sep) - if sep == nil then - sep = "%s" - end - local t={} ; i=1 - for str in string.gmatch(inputstr, "([^"..sep.."]+)") do - t[i] = str - i = i + 1 - end - return t + if sep == nil then + sep = "%s" + end + local t={} ; i=1 + for str in string.gmatch(inputstr, "([^"..sep.."]+)") do + t[i] = str + i = i + 1 + end + return t end From a3edd3eaceb706f58aaa9f641942dbb917bf2c46 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 1 May 2018 13:21:41 +0200 Subject: [PATCH 04/39] A lot of improvements. Fixed #5, fixed #4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - unknown commands will no longer be written out - a lot of formatting moved to i18n strings - fixes ÅÄÖ #5 - fixes #4 --- .editorconfig | 9 ------- README.md | 7 +---- __resource.lua | 27 ++++++++++--------- client/main.lua | 57 ++++++++++++++++------------------------ config.lua | 2 ++ locates/en.lua | 14 ++++++++++ locates/sv.lua | 14 ++++++++++ server/main.lua | 70 ++++++++++++++----------------------------------- 8 files changed, 88 insertions(+), 112 deletions(-) delete mode 100644 .editorconfig create mode 100644 config.lua create mode 100644 locates/en.lua create mode 100644 locates/sv.lua diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 4bfca33b..00000000 --- a/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -indent_size = 2 -indent_style = space -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true diff --git a/README.md b/README.md index 0e96f479..18cdf46b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,7 @@ # esx_rpchat -FXServer ESX RP Chat - #### Description -This is a proximity chat script. With a few commands such as Twitter, OOC, Local Me, and Local Do. - -#### Requirements -- [esx_identity](https://github.com/ESX-Org/esx_identity) +This is a proximity chat script. With a few commands such as Twitter, OOC and Local Me #### Download diff --git a/__resource.lua b/__resource.lua index 03ae3b2b..2c7124e9 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,20 +1,21 @@ ---[[ - - ESX RP Chat - ---]] - resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX RP Chat' -version '1.0.0' - -client_script 'client/main.lua' +version '1.1.0' server_scripts { - - '@mysql-async/lib/MySQL.lua', - 'server/main.lua' - + '@es_extended/locale.lua', + 'locates/sv.lua', + 'locates/en.lua', + 'config.lua', + 'server/main.lua' } + +client_scripts { + '@es_extended/locale.lua', + 'locates/sv.lua', + 'locates/en.lua', + 'config.lua', + 'client/main.lua' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index 4ae97c33..ac311ecc 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,38 +1,27 @@ ---[[ - - ESX RP Chat - ---]] - -RegisterNetEvent('sendProximityMessage') -AddEventHandler('sendProximityMessage', function(id, name, message) - local myId = PlayerId() - local pid = GetPlayerFromServerId(id) - if pid == myId then - TriggerEvent('chatMessage', "^4" .. name .. "", {0, 153, 204}, "^7 " .. message) - elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(myId)), GetEntityCoords(GetPlayerPed(pid)), true) < 19.999 then - TriggerEvent('chatMessage', "^4" .. name .. "", {0, 153, 204}, "^7 " .. message) - end +RegisterNetEvent('esx_rpchat:sendProximityMessage') +AddEventHandler('esx_rpchat:sendProximityMessage', function(id, prefix, message, color) + local _source = PlayerId() + local target = GetPlayerFromServerId(id) + + if target == _source then + TriggerEvent('chatMessage', prefix, color, message) + elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(_source)), GetEntityCoords(GetPlayerPed(target)), true) < 19.999 then + TriggerEvent('chatMessage', prefix, color, message) + end end) -RegisterNetEvent('sendProximityMessageMe') -AddEventHandler('sendProximityMessageMe', function(id, name, message) - local myId = PlayerId() - local pid = GetPlayerFromServerId(id) - if pid == myId then - TriggerEvent('chatMessage', "", {255, 0, 0}, " ^6 " .. name .." ".."^6 " .. message) - elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(myId)), GetEntityCoords(GetPlayerPed(pid)), true) < 19.999 then - TriggerEvent('chatMessage', "", {255, 0, 0}, " ^6 " .. name .." ".."^6 " .. message) - end +Citizen.CreateThread(function() + TriggerEvent('chat:addSuggestion', '/ooc', _U('ooc_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) + TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) + TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) + TriggerEvent('chat:addSuggestion', '/news', _U('news_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) end) -RegisterNetEvent('sendProximityMessageDo') -AddEventHandler('sendProximityMessageDo', function(id, name, message) - local myId = PlayerId() - local pid = GetPlayerFromServerId(id) - if pid == myId then - TriggerEvent('chatMessage', "", {255, 0, 0}, " ^0* " .. name .." ".."^0 " .. message) - elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(myId)), GetEntityCoords(GetPlayerPed(pid)), true) < 19.999 then - TriggerEvent('chatMessage', "", {255, 0, 0}, " ^0* " .. name .." ".."^0 " .. message) - end -end) +AddEventHandler('onResourceStop', function(resource) + if resource == GetCurrentResourceName() then + TriggerEvent('chat:removeSuggestion', '/ooc') + TriggerEvent('chat:removeSuggestion', '/twt') + TriggerEvent('chat:removeSuggestion', '/me') + TriggerEvent('chat:removeSuggestion', '/news') + end +end) \ No newline at end of file diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..ad83260a --- /dev/null +++ b/config.lua @@ -0,0 +1,2 @@ +Config = {} +Config.Locale = 'en' \ No newline at end of file diff --git a/locates/en.lua b/locates/en.lua new file mode 100644 index 00000000..23c74b14 --- /dev/null +++ b/locates/en.lua @@ -0,0 +1,14 @@ +Locales['en'] = { + -- ooc chat + ['ooc_help'] = 'type an out of character message', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'send a tweet', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'personal action', + ['me_prefix'] = 'me | %s', + ['news_help'] = 'announce news (do not abuse)', + ['news_prefix'] = 'news | %s', + ['ooc_argument_name'] = 'message', + ['ooc_argument_help'] = 'the message', + ['ooc_unknown_command'] = '^1%s^0 is not a valid command!', +} \ No newline at end of file diff --git a/locates/sv.lua b/locates/sv.lua new file mode 100644 index 00000000..09ecfee3 --- /dev/null +++ b/locates/sv.lua @@ -0,0 +1,14 @@ +Locales['sv'] = { + -- ooc chat + ['ooc_help'] = 'skicka ett meddelande som inte kopplat till din karaktär', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'skicka en tweet', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'skriv en händelse, t.ex \'visar körkort\'', + ['me_prefix'] = 'jag | %s', + ['news_help'] = 'meddela en nyhet (missbruka inte)', + ['news_prefix'] = 'TV4 Stockholm', + ['ooc_argument_name'] = 'meddelande', + ['ooc_argument_help'] = 'det meddelandet du vill skicka', + ['ooc_unknown_command'] = '^1%s^0 är inte ett giltigt kommando!', +} diff --git a/server/main.lua b/server/main.lua index 3ca33399..2e997f3c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,53 +1,23 @@ ---[[ - - ESX RP Chat - ---]] - -function getIdentity(source) - local identifier = GetPlayerIdentifiers(source)[1] - local result = MySQL.Sync.fetchAll("SELECT * FROM users WHERE identifier = @identifier", {['@identifier'] = identifier}) - if result[1] ~= nil then - local identity = result[1] - - return { - identifier = identity['identifier'], - firstname = identity['firstname'], - lastname = identity['lastname'], - dateofbirth = identity['dateofbirth'], - sex = identity['sex'], - height = identity['height'] - } - else - return nil +AddEventHandler('chatMessage', function(source, name, msg) + local command = stringsplit(msg, " ")[1]; + + if command == "/ooc" then + CancelEvent() + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('ooc_prefix', name), string.sub(msg, 5), { 128, 128, 128 }) + elseif command == "/twt" then + CancelEvent() + TriggerClientEvent('chatMessage', -1, _U('twt_prefix', name), { 0, 153, 204 }, string.sub(msg, 5)) + elseif command == "/me" then + CancelEvent() + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), string.sub(msg, 5), { 255, 0, 0 }) + elseif command == "/news" then + CancelEvent() + TriggerClientEvent('chatMessage', -1, _U('news_prefix', name), { 249, 166, 0 }, string.sub(msg, 6)) + elseif string.sub(command, 1, 1) == "/" then + CancelEvent() + TriggerClientEvent('chatMessage', source, '', {132, 13, 37}, _U('ooc_unknown_command', command)) end -end - - AddEventHandler('chatMessage', function(source, name, message) - if string.sub(message, 1, string.len("/")) ~= "/" then - local name = getIdentity(source) - TriggerClientEvent("sendProximityMessage", -1, source, name.firstname, message) - end - CancelEvent() - end) - - TriggerEvent('es:addCommand', 'me', function(source, args, user) - local name = getIdentity(source) - TriggerClientEvent("sendProximityMessageMe", -1, source, name.firstname, table.concat(args, " ")) - end) - - TriggerEvent('es:addCommand', 'do', function(source, args, user) - local name = getIdentity(source) - TriggerClientEvent("sendProximityMessageDo", -1, source, name.firstname, table.concat(args, " ")) - end) - - TriggerEvent('es:addCommand', 'twt', function(source, args, user) - TriggerClientEvent('chatMessage', -1, "^0[^4Twitter^0] (^5@" .. GetPlayerName(source) .. "^0)", {30, 144, 255}, table.concat(args, " ")) - end, {help = 'Send a tweet. [IC]'}) - - TriggerEvent('es:addCommand', 'ooc', function(source, args, user) - TriggerClientEvent('chatMessage', -1, "OOC | " .. GetPlayerName(source), {128, 128, 128}, table.concat(args, " ")) - end, {help = 'Send an out of character message to the whole server.'}) +end) function stringsplit(inputstr, sep) if sep == nil then @@ -59,4 +29,4 @@ function stringsplit(inputstr, sep) i = i + 1 end return t -end +end \ No newline at end of file From 191f12f5e02d1bb4455eebf888e557c944301d4d Mon Sep 17 00:00:00 2001 From: Oldarorn <36448848+Oldarorn@users.noreply.github.com> Date: Mon, 7 May 2018 07:29:47 +0200 Subject: [PATCH 05/39] Add the french translation to RPChat (#10) * FR translation * FR translation2 * edit in lower case --- __resource.lua | 4 +++- locates/fr.lua | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 locates/fr.lua diff --git a/__resource.lua b/__resource.lua index 2c7124e9..f90de495 100644 --- a/__resource.lua +++ b/__resource.lua @@ -8,6 +8,7 @@ server_scripts { '@es_extended/locale.lua', 'locates/sv.lua', 'locates/en.lua', + 'locates/fr.lua', 'config.lua', 'server/main.lua' } @@ -16,6 +17,7 @@ client_scripts { '@es_extended/locale.lua', 'locates/sv.lua', 'locates/en.lua', + 'locates/fr.lua', 'config.lua', 'client/main.lua' -} \ No newline at end of file +} diff --git a/locates/fr.lua b/locates/fr.lua new file mode 100644 index 00000000..808adcbe --- /dev/null +++ b/locates/fr.lua @@ -0,0 +1,14 @@ +Locales['fr'] = { + -- ooc chat + ['ooc_help'] = 'ecrit un message hors du personnage', + ['ooc_prefix'] = 'hrp | %s', + ['twt_help'] = 'envoie un tweet', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'action personnelle', + ['me_prefix'] = 'me | %s', + ['news_help'] = 'annonce une information (ne pas en abuser)', + ['news_prefix'] = 'info | %s', + ['ooc_argument_name'] = 'message', + ['ooc_argument_help'] = 'le message', + ['ooc_unknown_command'] = '^1%s^0 n\'est pas une commande valide!', +} From 1ed507693d8077c0a6944f73243291e91dfaab67 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 7 May 2018 22:29:53 +0200 Subject: [PATCH 06/39] Fixed ooc being proximity only, fixes #11 --- README.md | 14 +++++++++++++- __resource.lua | 4 ++-- locates/en.lua | 1 - locates/fr.lua | 1 - locates/sv.lua | 1 - server/main.lua | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 18cdf46b..fd6a5fe9 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,16 @@ git clone https://github.com/ESX-Org/esx_rpchat #### Installation -1) Add `start esx_rpchat` to your server.cfg \ No newline at end of file +1) Add `start esx_rpchat` to your server.cfg + +# Legal +### License +esx_rpchat - RP chat for ESX + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index f90de495..16eccc81 100644 --- a/__resource.lua +++ b/__resource.lua @@ -8,7 +8,7 @@ server_scripts { '@es_extended/locale.lua', 'locates/sv.lua', 'locates/en.lua', - 'locates/fr.lua', + 'locates/fr.lua', 'config.lua', 'server/main.lua' } @@ -17,7 +17,7 @@ client_scripts { '@es_extended/locale.lua', 'locates/sv.lua', 'locates/en.lua', - 'locates/fr.lua', + 'locates/fr.lua', 'config.lua', 'client/main.lua' } diff --git a/locates/en.lua b/locates/en.lua index 23c74b14..3d1e1532 100644 --- a/locates/en.lua +++ b/locates/en.lua @@ -1,5 +1,4 @@ Locales['en'] = { - -- ooc chat ['ooc_help'] = 'type an out of character message', ['ooc_prefix'] = 'OOC | %s', ['twt_help'] = 'send a tweet', diff --git a/locates/fr.lua b/locates/fr.lua index 808adcbe..9d2348d4 100644 --- a/locates/fr.lua +++ b/locates/fr.lua @@ -1,5 +1,4 @@ Locales['fr'] = { - -- ooc chat ['ooc_help'] = 'ecrit un message hors du personnage', ['ooc_prefix'] = 'hrp | %s', ['twt_help'] = 'envoie un tweet', diff --git a/locates/sv.lua b/locates/sv.lua index 09ecfee3..341449f0 100644 --- a/locates/sv.lua +++ b/locates/sv.lua @@ -1,5 +1,4 @@ Locales['sv'] = { - -- ooc chat ['ooc_help'] = 'skicka ett meddelande som inte kopplat till din karaktär', ['ooc_prefix'] = 'OOC | %s', ['twt_help'] = 'skicka en tweet', diff --git a/server/main.lua b/server/main.lua index 2e997f3c..d15d81c7 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,7 +3,7 @@ AddEventHandler('chatMessage', function(source, name, msg) if command == "/ooc" then CancelEvent() - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('ooc_prefix', name), string.sub(msg, 5), { 128, 128, 128 }) + TriggerClientEvent('chatMessage', -1, _U('ooc_prefix', name), { 128, 128, 128 }, string.sub(msg, 5)) elseif command == "/twt" then CancelEvent() TriggerClientEvent('chatMessage', -1, _U('twt_prefix', name), { 0, 153, 204 }, string.sub(msg, 5)) From 24acdda8b885bb6372b73387e660d7c4daea71dd Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 10 May 2018 10:08:52 +0200 Subject: [PATCH 07/39] Re-implemented RP names, closes #12 --- __resource.lua | 1 + config.lua | 5 ++++- server/main.lua | 26 ++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/__resource.lua b/__resource.lua index 16eccc81..308a1ca6 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,6 +5,7 @@ description 'ESX RP Chat' version '1.1.0' server_scripts { + '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locates/sv.lua', 'locates/en.lua', diff --git a/config.lua b/config.lua index ad83260a..15e7a099 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,5 @@ Config = {} -Config.Locale = 'en' \ No newline at end of file +Config.Locale = 'en' + +Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity and want to use RP names +Config.OnlyFirstname = false \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index d15d81c7..7e9334fc 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,17 +1,21 @@ AddEventHandler('chatMessage', function(source, name, msg) local command = stringsplit(msg, " ")[1]; - + if command == "/ooc" then CancelEvent() + if Config.EnableESXIdentity then name = GetCharacterName(source) end TriggerClientEvent('chatMessage', -1, _U('ooc_prefix', name), { 128, 128, 128 }, string.sub(msg, 5)) elseif command == "/twt" then CancelEvent() + if Config.EnableESXIdentity then name = GetCharacterName(source) end TriggerClientEvent('chatMessage', -1, _U('twt_prefix', name), { 0, 153, 204 }, string.sub(msg, 5)) elseif command == "/me" then CancelEvent() - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), string.sub(msg, 5), { 255, 0, 0 }) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), string.sub(msg, 4), { 255, 0, 0 }) elseif command == "/news" then CancelEvent() + if Config.EnableESXIdentity then name = GetCharacterName(source) end TriggerClientEvent('chatMessage', -1, _U('news_prefix', name), { 249, 166, 0 }, string.sub(msg, 6)) elseif string.sub(command, 1, 1) == "/" then CancelEvent() @@ -29,4 +33,22 @@ function stringsplit(inputstr, sep) i = i + 1 end return t +end + +function GetCharacterName(source) + -- fetch identity in sync + local result = MySQL.Sync.fetchAll('SELECT * FROM users WHERE identifier = @identifier', + { + ['@identifier'] = GetPlayerIdentifiers(source)[1] + }) + + if result[1] ~= nil and result[1].firstname ~= nil and result[1].lastname ~= nil then + if Config.OnlyFirstname then + return result[1].firstname + else + return result[1].firstname .. ' ' .. result[1].lastname + end + else + return GetPlayerName(source) + end end \ No newline at end of file From 578c336e39f39058c8bdc6ce582228f219343327 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 10 May 2018 10:16:28 +0200 Subject: [PATCH 08/39] Version bump --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 308a1ca6..3e120fea 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX RP Chat' -version '1.1.0' +version '1.2.0' server_scripts { '@mysql-async/lib/MySQL.lua', From dc43bb74cd1ad5233853823d640aa9a052a67217 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 21:11:10 +0300 Subject: [PATCH 09/39] Add Finnish lang... --- __resource.lua | 2 ++ locates/fi.lua | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 locates/fi.lua diff --git a/__resource.lua b/__resource.lua index 3e120fea..741dc050 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,6 +9,7 @@ server_scripts { '@es_extended/locale.lua', 'locates/sv.lua', 'locates/en.lua', + 'locates/fi.lua', 'locates/fr.lua', 'config.lua', 'server/main.lua' @@ -18,6 +19,7 @@ client_scripts { '@es_extended/locale.lua', 'locates/sv.lua', 'locates/en.lua', + 'locates/fi.lua', 'locates/fr.lua', 'config.lua', 'client/main.lua' diff --git a/locates/fi.lua b/locates/fi.lua new file mode 100644 index 00000000..bb93fbbd --- /dev/null +++ b/locates/fi.lua @@ -0,0 +1,13 @@ +Locales['fi'] = { + ['ooc_help'] = 'kirjota hahmon ulkopuolelle liittyvä viesti', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'lähetä twiitti', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'teet jotain', + ['me_prefix'] = 'me | %s', + ['news_help'] = 'ilmoita uutinen (älä abuse)', + ['news_prefix'] = 'news | %s', + ['ooc_argument_name'] = 'viesti', + ['ooc_argument_help'] = 'viestin sisältö', + ['ooc_unknown_command'] = '^1%s^0 ei ole validi komento!', +} \ No newline at end of file From c5c9ad0e839acd23425f26cbbe2450454cfdbb15 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 11 Jul 2018 12:32:03 +0200 Subject: [PATCH 10/39] Proper locale name --- README.md | 22 ++++++++++------------ __resource.lua | 14 ++++++++------ {locates => locales}/en.lua | 0 {locates => locales}/fr.lua | 0 {locates => locales}/sv.lua | 0 5 files changed, 18 insertions(+), 18 deletions(-) rename {locates => locales}/en.lua (100%) rename {locates => locales}/fr.lua (100%) rename {locates => locales}/sv.lua (100%) diff --git a/README.md b/README.md index fd6a5fe9..492ed3be 100644 --- a/README.md +++ b/README.md @@ -3,27 +3,25 @@ #### Description This is a proximity chat script. With a few commands such as Twitter, OOC and Local Me -#### Download +## Download & Installation -**1) Using [fvm](https://github.com/qlaffont/fvm-installer)** +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` fvm install --save --folder=esx esx-org/esx_rpchat ``` -**2) Manually** -- Download https://github.com/ESX-Org/esx_rpchat/releases/latest -- Put it in resource/[esx] directory - -**3) Using Git** - +### Using Git ``` -cd resouces -git clone https://github.com/ESX-Org/esx_rpchat +cd resources +git clone https://github.com/ESX-Org/esx_rpchat [esx]/esx_rpchat ``` -#### Installation +### Manually +- Download https://github.com/ESX-Org/esx_rpchat/archive/master.zip +- Put it in the `[esx]` directory -1) Add `start esx_rpchat` to your server.cfg +## Installation +- Add `start esx_rpchat` to your server.cfg # Legal ### License diff --git a/__resource.lua b/__resource.lua index 3e120fea..0aff355b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,18 +7,20 @@ version '1.2.0' server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', - 'locates/sv.lua', - 'locates/en.lua', - 'locates/fr.lua', + 'locales/sv.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locates/sv.lua', - 'locates/en.lua', - 'locates/fr.lua', + 'locales/sv.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/main.lua' } + +dependency 'es_extended' \ No newline at end of file diff --git a/locates/en.lua b/locales/en.lua similarity index 100% rename from locates/en.lua rename to locales/en.lua diff --git a/locates/fr.lua b/locales/fr.lua similarity index 100% rename from locates/fr.lua rename to locales/fr.lua diff --git a/locates/sv.lua b/locales/sv.lua similarity index 100% rename from locates/sv.lua rename to locales/sv.lua From cbf86e04d6245bdfba6c8905168640c7afe0379c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 18 Jul 2018 12:22:11 +0200 Subject: [PATCH 11/39] Use RegisterCommand instead of listen to chatMessage event, updates --- client/main.lua | 12 ++++----- locales/en.lua | 2 +- locales/fi.lua | 2 +- locales/fr.lua | 4 +-- locales/sv.lua | 4 +-- server/main.lua | 66 ++++++++++++++++++++++++++----------------------- 6 files changed, 47 insertions(+), 43 deletions(-) diff --git a/client/main.lua b/client/main.lua index ac311ecc..b2f522b3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,12 +1,12 @@ RegisterNetEvent('esx_rpchat:sendProximityMessage') -AddEventHandler('esx_rpchat:sendProximityMessage', function(id, prefix, message, color) - local _source = PlayerId() +AddEventHandler('esx_rpchat:sendProximityMessage', function(id, title, message, color) + local source = PlayerId() local target = GetPlayerFromServerId(id) - if target == _source then - TriggerEvent('chatMessage', prefix, color, message) - elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(_source)), GetEntityCoords(GetPlayerPed(target)), true) < 19.999 then - TriggerEvent('chatMessage', prefix, color, message) + if target == source then + TriggerEvent('chat:addMessage', { args = { title, message }, color = color }) + elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(source)), GetEntityCoords(GetPlayerPed(target)), true) < 19 then + TriggerEvent('chat:addMessage', { args = { title, message }, color = color }) end end) diff --git a/locales/en.lua b/locales/en.lua index 3d1e1532..494df83d 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -9,5 +9,5 @@ Locales['en'] = { ['news_prefix'] = 'news | %s', ['ooc_argument_name'] = 'message', ['ooc_argument_help'] = 'the message', - ['ooc_unknown_command'] = '^1%s^0 is not a valid command!', + ['ooc_unknown_command'] = '^3%s^0 is not a valid command!', } \ No newline at end of file diff --git a/locales/fi.lua b/locales/fi.lua index bb93fbbd..0a2fcc64 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -9,5 +9,5 @@ Locales['fi'] = { ['news_prefix'] = 'news | %s', ['ooc_argument_name'] = 'viesti', ['ooc_argument_help'] = 'viestin sisältö', - ['ooc_unknown_command'] = '^1%s^0 ei ole validi komento!', + ['ooc_unknown_command'] = '^3%s^0 ei ole validi komento!', } \ No newline at end of file diff --git a/locales/fr.lua b/locales/fr.lua index 9d2348d4..a0ac7cd4 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -9,5 +9,5 @@ Locales['fr'] = { ['news_prefix'] = 'info | %s', ['ooc_argument_name'] = 'message', ['ooc_argument_help'] = 'le message', - ['ooc_unknown_command'] = '^1%s^0 n\'est pas une commande valide!', -} + ['ooc_unknown_command'] = '^3%s^0 n\'est pas une commande valide!', +} \ No newline at end of file diff --git a/locales/sv.lua b/locales/sv.lua index 341449f0..d4020d27 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -9,5 +9,5 @@ Locales['sv'] = { ['news_prefix'] = 'TV4 Stockholm', ['ooc_argument_name'] = 'meddelande', ['ooc_argument_help'] = 'det meddelandet du vill skicka', - ['ooc_unknown_command'] = '^1%s^0 är inte ett giltigt kommando!', -} + ['ooc_unknown_command'] = '^3%s^0 är inte ett giltigt kommando!', +} \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 7e9334fc..4a95a442 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,39 +1,43 @@ -AddEventHandler('chatMessage', function(source, name, msg) - local command = stringsplit(msg, " ")[1]; +AddEventHandler('chatMessage', function(source, author, message) - if command == "/ooc" then + if string.sub(message, 1, 1) == "/" then CancelEvent() - if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('chatMessage', -1, _U('ooc_prefix', name), { 128, 128, 128 }, string.sub(msg, 5)) - elseif command == "/twt" then - CancelEvent() - if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('chatMessage', -1, _U('twt_prefix', name), { 0, 153, 204 }, string.sub(msg, 5)) - elseif command == "/me" then - CancelEvent() - if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), string.sub(msg, 4), { 255, 0, 0 }) - elseif command == "/news" then - CancelEvent() - if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('chatMessage', -1, _U('news_prefix', name), { 249, 166, 0 }, string.sub(msg, 6)) - elseif string.sub(command, 1, 1) == "/" then - CancelEvent() - TriggerClientEvent('chatMessage', source, '', {132, 13, 37}, _U('ooc_unknown_command', command)) + TriggerClientEvent('chat:addMessage', -1, { args = { '^1SYSTEM', _U('ooc_unknown_command', message) } }) end + end) -function stringsplit(inputstr, sep) - if sep == nil then - sep = "%s" - end - local t={} ; i=1 - for str in string.gmatch(inputstr, "([^"..sep.."]+)") do - t[i] = str - i = i + 1 - end - return t -end +RegisterCommand('ooc', function(source, args, rawCommand) + rawCommand = string.sub(rawCommand, 4) + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('chat:addMessage', -1, { args = { _U('ooc_prefix', name), rawCommand }, color = { 128, 128, 128 } }) +end, false) + +RegisterCommand('twt', function(source, args, rawCommand) + rawCommand = string.sub(rawCommand, 4) + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('chat:addMessage', -1, { args = { _U('twt_prefix', name), rawCommand }, color = { 0, 153, 204 } }) +end, false) + +RegisterCommand('me', function(source, args, rawCommand) + rawCommand = string.sub(rawCommand, 3) + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), rawCommand, { 255, 0, 0 }) +end, false) + +RegisterCommand('news', function(source, args, rawCommand) + rawCommand = string.sub(rawCommand, 5) + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('chat:addMessage', -1, { args = { _U('news_prefix', name), rawCommand }, color = { 249, 166, 0 } }) +end, false) function GetCharacterName(source) -- fetch identity in sync From eb02731854a4ffa233fd61fb8cb79e680e85d10c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 18 Jul 2018 12:24:22 +0200 Subject: [PATCH 12/39] Final commit v1.3.0 --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 9502cf36..876ed6fe 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX RP Chat' -version '1.2.0' +version '1.3.0' server_scripts { '@mysql-async/lib/MySQL.lua', From 8f442dc2028ecfac205bc34090e12d9de4280682 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 18 Jul 2018 22:14:22 +0200 Subject: [PATCH 13/39] Only show local player if invalid command --- client/main.lua | 8 ++++---- server/main.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index b2f522b3..3b0edf2b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -11,10 +11,10 @@ AddEventHandler('esx_rpchat:sendProximityMessage', function(id, title, message, end) Citizen.CreateThread(function() - TriggerEvent('chat:addSuggestion', '/ooc', _U('ooc_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) - TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) - TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) - TriggerEvent('chat:addSuggestion', '/news', _U('news_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}}) + TriggerEvent('chat:addSuggestion', '/ooc', _U('ooc_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/news', _U('news_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) end) AddEventHandler('onResourceStop', function(resource) diff --git a/server/main.lua b/server/main.lua index 4a95a442..d720ca20 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,7 +2,7 @@ AddEventHandler('chatMessage', function(source, author, message) if string.sub(message, 1, 1) == "/" then CancelEvent() - TriggerClientEvent('chat:addMessage', -1, { args = { '^1SYSTEM', _U('ooc_unknown_command', message) } }) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', message) } }) end end) From cef4bbd8a13189d09145f138463bca36ce3619ca Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:55:21 -0400 Subject: [PATCH 14/39] Repo Update --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file From 4e4484f0ffbf8bc66ac033deea2b827572ca1bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= Date: Mon, 13 Aug 2018 20:13:35 +0200 Subject: [PATCH 15/39] Add of /do (#18) * Add /do !Needs check of translations except for English! * Hotfix: locales first letter case * Hotfix: French typo --- client/main.lua | 6 ++++-- locales/en.lua | 4 +++- locales/fi.lua | 4 +++- locales/fr.lua | 4 +++- locales/sv.lua | 4 +++- server/main.lua | 10 +++++++++- 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/client/main.lua b/client/main.lua index 3b0edf2b..a95c4007 100644 --- a/client/main.lua +++ b/client/main.lua @@ -2,7 +2,7 @@ RegisterNetEvent('esx_rpchat:sendProximityMessage') AddEventHandler('esx_rpchat:sendProximityMessage', function(id, title, message, color) local source = PlayerId() local target = GetPlayerFromServerId(id) - + if target == source then TriggerEvent('chat:addMessage', { args = { title, message }, color = color }) elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(source)), GetEntityCoords(GetPlayerPed(target)), true) < 19 then @@ -14,6 +14,7 @@ Citizen.CreateThread(function() TriggerEvent('chat:addSuggestion', '/ooc', _U('ooc_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/do', _U('do_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) TriggerEvent('chat:addSuggestion', '/news', _U('news_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) end) @@ -22,6 +23,7 @@ AddEventHandler('onResourceStop', function(resource) TriggerEvent('chat:removeSuggestion', '/ooc') TriggerEvent('chat:removeSuggestion', '/twt') TriggerEvent('chat:removeSuggestion', '/me') + TriggerEvent('chat:removeSuggestion', '/do') TriggerEvent('chat:removeSuggestion', '/news') end -end) \ No newline at end of file +end) diff --git a/locales/en.lua b/locales/en.lua index 494df83d..e5bd70bf 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -5,9 +5,11 @@ Locales['en'] = { ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', ['me_help'] = 'personal action', ['me_prefix'] = 'me | %s', + ['do_help'] = 'rP information', + ['do_prefix'] = 'do | %s', ['news_help'] = 'announce news (do not abuse)', ['news_prefix'] = 'news | %s', ['ooc_argument_name'] = 'message', ['ooc_argument_help'] = 'the message', ['ooc_unknown_command'] = '^3%s^0 is not a valid command!', -} \ No newline at end of file +} diff --git a/locales/fi.lua b/locales/fi.lua index 0a2fcc64..bf4fb81a 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -5,9 +5,11 @@ Locales['fi'] = { ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', ['me_help'] = 'teet jotain', ['me_prefix'] = 'me | %s', + ['do_help'] = 'roolipeliä tiedot', --TODO: check translation + ['do_prefix'] = 'do | %s', ['news_help'] = 'ilmoita uutinen (älä abuse)', ['news_prefix'] = 'news | %s', ['ooc_argument_name'] = 'viesti', ['ooc_argument_help'] = 'viestin sisältö', ['ooc_unknown_command'] = '^3%s^0 ei ole validi komento!', -} \ No newline at end of file +} diff --git a/locales/fr.lua b/locales/fr.lua index a0ac7cd4..108c6bad 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -5,9 +5,11 @@ Locales['fr'] = { ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', ['me_help'] = 'action personnelle', ['me_prefix'] = 'me | %s', + ['do_help'] = 'rP information', --TODO: check translation + ['do_prefix'] = 'faire | %s', ['news_help'] = 'annonce une information (ne pas en abuser)', ['news_prefix'] = 'info | %s', ['ooc_argument_name'] = 'message', ['ooc_argument_help'] = 'le message', ['ooc_unknown_command'] = '^3%s^0 n\'est pas une commande valide!', -} \ No newline at end of file +} diff --git a/locales/sv.lua b/locales/sv.lua index d4020d27..0d24eb7a 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -5,9 +5,11 @@ Locales['sv'] = { ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', ['me_help'] = 'skriv en händelse, t.ex \'visar körkort\'', ['me_prefix'] = 'jag | %s', + ['do_help'] = 'rollspelinformation', --TODO: check translation + ['do_prefix'] = 'do | %s', ['news_help'] = 'meddela en nyhet (missbruka inte)', ['news_prefix'] = 'TV4 Stockholm', ['ooc_argument_name'] = 'meddelande', ['ooc_argument_help'] = 'det meddelandet du vill skicka', ['ooc_unknown_command'] = '^3%s^0 är inte ett giltigt kommando!', -} \ No newline at end of file +} diff --git a/server/main.lua b/server/main.lua index d720ca20..cecc16db 100644 --- a/server/main.lua +++ b/server/main.lua @@ -31,6 +31,14 @@ RegisterCommand('me', function(source, args, rawCommand) TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), rawCommand, { 255, 0, 0 }) end, false) +RegisterCommand('do', function(source, args, rawCommand) + rawCommand = string.sub(rawCommand, 3) + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', name), rawCommand, { 0, 0, 255 }) +end, false) + RegisterCommand('news', function(source, args, rawCommand) rawCommand = string.sub(rawCommand, 5) local name = GetPlayerName(source) @@ -55,4 +63,4 @@ function GetCharacterName(source) else return GetPlayerName(source) end -end \ No newline at end of file +end From fe242059a94b77ba5b3dd802ef0f876a08f44416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= Date: Tue, 14 Aug 2018 23:09:12 +0200 Subject: [PATCH 16/39] Czech translate --- __resource.lua | 4 +++- locales/cs.lua | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 locales/cs.lua diff --git a/__resource.lua b/__resource.lua index 876ed6fe..d5cea34f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/cs.lua', 'config.lua', 'server/main.lua' } @@ -21,8 +22,9 @@ client_scripts { 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/cs.lua', 'config.lua', 'client/main.lua' } -dependency 'es_extended' \ No newline at end of file +dependency 'es_extended' diff --git a/locales/cs.lua b/locales/cs.lua new file mode 100644 index 00000000..f17d7419 --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,15 @@ +Locales['cs'] = { + ['ooc_help'] = 'poslat out of character zprávu', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'odeslat tweet', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'osobní akce', + ['me_prefix'] = 'me | %s', + ['do_help'] = 'rP informace', + ['do_prefix'] = 'do | %s', + ['news_help'] = 'oznámit zprávy (nezneužívat)', + ['news_prefix'] = 'news | %s', + ['ooc_argument_name'] = 'zpráva', + ['ooc_argument_help'] = 'zpráva', + ['ooc_unknown_command'] = '^3%s^0 není platný příkaz!', +} From df17fde7227a2c94e14a6b3c894895f8b293b648 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 29 Sep 2018 14:48:30 +0200 Subject: [PATCH 17/39] Only show first word of command entered when invalid, dont let rcon use commands --- server/main.lua | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/server/main.lua b/server/main.lua index cecc16db..7be91256 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,13 +1,16 @@ AddEventHandler('chatMessage', function(source, author, message) - if string.sub(message, 1, 1) == "/" then CancelEvent() - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', message) } }) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', message:match("^(%S+)")) } }) end - end) RegisterCommand('ooc', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + rawCommand = string.sub(rawCommand, 4) local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end @@ -16,6 +19,11 @@ RegisterCommand('ooc', function(source, args, rawCommand) end, false) RegisterCommand('twt', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + rawCommand = string.sub(rawCommand, 4) local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end @@ -24,6 +32,11 @@ RegisterCommand('twt', function(source, args, rawCommand) end, false) RegisterCommand('me', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + rawCommand = string.sub(rawCommand, 3) local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end @@ -32,6 +45,11 @@ RegisterCommand('me', function(source, args, rawCommand) end, false) RegisterCommand('do', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + rawCommand = string.sub(rawCommand, 3) local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end @@ -40,6 +58,11 @@ RegisterCommand('do', function(source, args, rawCommand) end, false) RegisterCommand('news', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + rawCommand = string.sub(rawCommand, 5) local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end From d21728be5999012e23386695c6a7b916222d0299 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Sep 2018 12:09:24 +0200 Subject: [PATCH 18/39] Proper event handler for handling invalid commands --- server/main.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/main.lua b/server/main.lua index 7be91256..d1dc69eb 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,8 +1,6 @@ -AddEventHandler('chatMessage', function(source, author, message) - if string.sub(message, 1, 1) == "/" then - CancelEvent() - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', message:match("^(%S+)")) } }) - end +AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) + CancelEvent() + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', command_args[1]) } }) end) RegisterCommand('ooc', function(source, args, rawCommand) From a567e94f50bc7452944d9ad53e81d57d9dc9f7cd Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 10 Nov 2018 23:30:14 +0100 Subject: [PATCH 19/39] Don't select everything, async usage --- server/main.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/server/main.lua b/server/main.lua index d1dc69eb..3e46bf71 100644 --- a/server/main.lua +++ b/server/main.lua @@ -69,19 +69,21 @@ RegisterCommand('news', function(source, args, rawCommand) end, false) function GetCharacterName(source) - -- fetch identity in sync - local result = MySQL.Sync.fetchAll('SELECT * FROM users WHERE identifier = @identifier', - { - ['@identifier'] = GetPlayerIdentifiers(source)[1] - }) - if result[1] ~= nil and result[1].firstname ~= nil and result[1].lastname ~= nil then - if Config.OnlyFirstname then - return result[1].firstname + MySQL.Async.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', { + ['@identifier'] = GetPlayerIdentifiers(source)[1] + }, function(result) + if result[1] ~= nil and result[1].firstname ~= nil and result[1].lastname ~= nil then + + if Config.OnlyFirstname then + return result[1].firstname + else + return result[1].firstname .. ' ' .. result[1].lastname + end + else - return result[1].firstname .. ' ' .. result[1].lastname + return GetPlayerName(source) end - else - return GetPlayerName(source) - end + end) + end From 982fdb87d7822f375093fb0b7ca2362eb3a17662 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 15:53:52 +0100 Subject: [PATCH 20/39] Revert "Don't select everything, async usage" This reverts commit a567e94f50bc7452944d9ad53e81d57d9dc9f7cd. --- server/main.lua | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/server/main.lua b/server/main.lua index 3e46bf71..d1dc69eb 100644 --- a/server/main.lua +++ b/server/main.lua @@ -69,21 +69,19 @@ RegisterCommand('news', function(source, args, rawCommand) end, false) function GetCharacterName(source) - - MySQL.Async.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', { + -- fetch identity in sync + local result = MySQL.Sync.fetchAll('SELECT * FROM users WHERE identifier = @identifier', + { ['@identifier'] = GetPlayerIdentifiers(source)[1] - }, function(result) - if result[1] ~= nil and result[1].firstname ~= nil and result[1].lastname ~= nil then - - if Config.OnlyFirstname then - return result[1].firstname - else - return result[1].firstname .. ' ' .. result[1].lastname - end + }) + if result[1] ~= nil and result[1].firstname ~= nil and result[1].lastname ~= nil then + if Config.OnlyFirstname then + return result[1].firstname else - return GetPlayerName(source) + return result[1].firstname .. ' ' .. result[1].lastname end - end) - + else + return GetPlayerName(source) + end end From 70ef871a91b6f159b391c7ea874fd9a3ccf18d26 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 15:54:36 +0100 Subject: [PATCH 21/39] Only select name --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index d1dc69eb..34c8387d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -70,12 +70,12 @@ end, false) function GetCharacterName(source) -- fetch identity in sync - local result = MySQL.Sync.fetchAll('SELECT * FROM users WHERE identifier = @identifier', + local result = MySQL.Sync.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', { ['@identifier'] = GetPlayerIdentifiers(source)[1] }) - if result[1] ~= nil and result[1].firstname ~= nil and result[1].lastname ~= nil then + if result[1] and result[1].firstname and result[1].lastname then if Config.OnlyFirstname then return result[1].firstname else From f210796cbef6467ce00d780fa801f2e20301a61b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 9 Dec 2018 12:24:15 +0100 Subject: [PATCH 22/39] Cleanup, default messages to ooc, enforce 2 space indent on locale files --- client/main.lua | 9 ++++++--- locales/cs.lua | 23 ++++++++++------------ locales/en.lua | 23 ++++++++++------------ locales/fi.lua | 23 ++++++++++------------ locales/fr.lua | 23 ++++++++++------------ locales/sv.lua | 23 ++++++++++------------ server/main.lua | 52 +++++++++++++++++-------------------------------- 7 files changed, 74 insertions(+), 102 deletions(-) diff --git a/client/main.lua b/client/main.lua index a95c4007..3f57e522 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,11 +1,14 @@ RegisterNetEvent('esx_rpchat:sendProximityMessage') -AddEventHandler('esx_rpchat:sendProximityMessage', function(id, title, message, color) +AddEventHandler('esx_rpchat:sendProximityMessage', function(playerId, title, message, color) local source = PlayerId() - local target = GetPlayerFromServerId(id) + local target = GetPlayerFromServerId(playerId) + + local sourcePed, targetPed = PlayerPedId(), GetPlayerPed(target) + local sourceCoords, targetCoords = GetEntityCoords(sourcePed), GetEntityCoords(targetPed) if target == source then TriggerEvent('chat:addMessage', { args = { title, message }, color = color }) - elseif GetDistanceBetweenCoords(GetEntityCoords(GetPlayerPed(source)), GetEntityCoords(GetPlayerPed(target)), true) < 19 then + elseif GetDistanceBetweenCoords(sourceCoords, targetCoords, true) < 20 then TriggerEvent('chat:addMessage', { args = { title, message }, color = color }) end end) diff --git a/locales/cs.lua b/locales/cs.lua index f17d7419..112d386a 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -1,15 +1,12 @@ Locales['cs'] = { - ['ooc_help'] = 'poslat out of character zprávu', - ['ooc_prefix'] = 'OOC | %s', - ['twt_help'] = 'odeslat tweet', - ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', - ['me_help'] = 'osobní akce', - ['me_prefix'] = 'me | %s', - ['do_help'] = 'rP informace', - ['do_prefix'] = 'do | %s', - ['news_help'] = 'oznámit zprávy (nezneužívat)', - ['news_prefix'] = 'news | %s', - ['ooc_argument_name'] = 'zpráva', - ['ooc_argument_help'] = 'zpráva', - ['ooc_unknown_command'] = '^3%s^0 není platný příkaz!', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'odeslat tweet', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'osobní akce', + ['me_prefix'] = 'me | %s', + ['do_help'] = 'RP informace', + ['do_prefix'] = 'do | %s', + ['generic_argument_name'] = 'zpráva', + ['generic_argument_help'] = 'zpráva', + ['generic_unknown_command'] = '^3%s^0 není platný příkaz!', } diff --git a/locales/en.lua b/locales/en.lua index e5bd70bf..fb7ad19a 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,15 +1,12 @@ Locales['en'] = { - ['ooc_help'] = 'type an out of character message', - ['ooc_prefix'] = 'OOC | %s', - ['twt_help'] = 'send a tweet', - ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', - ['me_help'] = 'personal action', - ['me_prefix'] = 'me | %s', - ['do_help'] = 'rP information', - ['do_prefix'] = 'do | %s', - ['news_help'] = 'announce news (do not abuse)', - ['news_prefix'] = 'news | %s', - ['ooc_argument_name'] = 'message', - ['ooc_argument_help'] = 'the message', - ['ooc_unknown_command'] = '^3%s^0 is not a valid command!', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'send a tweet', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'personal action', + ['me_prefix'] = 'me | %s', + ['do_help'] = 'RP information', + ['do_prefix'] = 'do | %s', + ['generic_argument_name'] = 'message', + ['generic_argument_help'] = 'the message', + ['generic_unknown_command'] = '^3%s^0 is not a valid command!', } diff --git a/locales/fi.lua b/locales/fi.lua index bf4fb81a..92dbd9c7 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,15 +1,12 @@ Locales['fi'] = { - ['ooc_help'] = 'kirjota hahmon ulkopuolelle liittyvä viesti', - ['ooc_prefix'] = 'OOC | %s', - ['twt_help'] = 'lähetä twiitti', - ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', - ['me_help'] = 'teet jotain', - ['me_prefix'] = 'me | %s', - ['do_help'] = 'roolipeliä tiedot', --TODO: check translation - ['do_prefix'] = 'do | %s', - ['news_help'] = 'ilmoita uutinen (älä abuse)', - ['news_prefix'] = 'news | %s', - ['ooc_argument_name'] = 'viesti', - ['ooc_argument_help'] = 'viestin sisältö', - ['ooc_unknown_command'] = '^3%s^0 ei ole validi komento!', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'lähetä twiitti', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'teet jotain', + ['me_prefix'] = 'me | %s', + ['do_help'] = 'roolipeliä tiedot', --TODO: check translation + ['do_prefix'] = 'do | %s', + ['generic_argument_name'] = 'viesti', + ['generic_argument_help'] = 'viestin sisältö', + ['generic_unknown_command'] = '^3%s^0 ei ole validi komento!', } diff --git a/locales/fr.lua b/locales/fr.lua index 108c6bad..d2d24632 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,15 +1,12 @@ Locales['fr'] = { - ['ooc_help'] = 'ecrit un message hors du personnage', - ['ooc_prefix'] = 'hrp | %s', - ['twt_help'] = 'envoie un tweet', - ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', - ['me_help'] = 'action personnelle', - ['me_prefix'] = 'me | %s', - ['do_help'] = 'rP information', --TODO: check translation - ['do_prefix'] = 'faire | %s', - ['news_help'] = 'annonce une information (ne pas en abuser)', - ['news_prefix'] = 'info | %s', - ['ooc_argument_name'] = 'message', - ['ooc_argument_help'] = 'le message', - ['ooc_unknown_command'] = '^3%s^0 n\'est pas une commande valide!', + ['ooc_prefix'] = 'hrp | %s', + ['twt_help'] = 'envoie un tweet', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'action personnelle', + ['me_prefix'] = 'me | %s', + ['do_help'] = 'RP information', --TODO: check translation + ['do_prefix'] = 'faire | %s', + ['generic_argument_name'] = 'message', + ['generic_argument_help'] = 'le message', + ['generic_unknown_command'] = '^3%s^0 n\'est pas une commande valide!', } diff --git a/locales/sv.lua b/locales/sv.lua index 0d24eb7a..1c865a46 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,15 +1,12 @@ Locales['sv'] = { - ['ooc_help'] = 'skicka ett meddelande som inte kopplat till din karaktär', - ['ooc_prefix'] = 'OOC | %s', - ['twt_help'] = 'skicka en tweet', - ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', - ['me_help'] = 'skriv en händelse, t.ex \'visar körkort\'', - ['me_prefix'] = 'jag | %s', - ['do_help'] = 'rollspelinformation', --TODO: check translation - ['do_prefix'] = 'do | %s', - ['news_help'] = 'meddela en nyhet (missbruka inte)', - ['news_prefix'] = 'TV4 Stockholm', - ['ooc_argument_name'] = 'meddelande', - ['ooc_argument_help'] = 'det meddelandet du vill skicka', - ['ooc_unknown_command'] = '^3%s^0 är inte ett giltigt kommando!', + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'skicka en tweet', + ['twt_prefix'] = '^5@%s^0', + ['me_help'] = 'skriv en händelse, t.ex \'visar körkort\'', + ['me_prefix'] = 'jag | %s', + ['do_help'] = 'något karaktären gör inom rollspel', + ['do_prefix'] = 'gör | %s', + ['generic_argument_name'] = 'meddelande', + ['generic_argument_help'] = 'det meddelandet du vill skicka', + ['generic_unknown_command'] = '^3%s^0 är inte ett giltigt kommando!', } diff --git a/server/main.lua b/server/main.lua index 34c8387d..f77f30dd 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,18 +3,14 @@ AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', command_args[1]) } }) end) -RegisterCommand('ooc', function(source, args, rawCommand) - if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return +AddEventHandler('chatMessage', function(source, name, message) + if string.sub(message, 1, string.len('/')) ~= '/' then + CancelEvent() + + if Config.EnableESXIdentity then name = GetCharacterName(source) end + TriggerClientEvent('chat:addMessage', -1, { args = { _U('ooc_prefix', name), message }, color = { 128, 128, 128 } }) end - - rawCommand = string.sub(rawCommand, 4) - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('chat:addMessage', -1, { args = { _U('ooc_prefix', name), rawCommand }, color = { 128, 128, 128 } }) -end, false) +end) RegisterCommand('twt', function(source, args, rawCommand) if source == 0 then @@ -22,11 +18,12 @@ RegisterCommand('twt', function(source, args, rawCommand) return end - rawCommand = string.sub(rawCommand, 4) + args = table.concat(args, ' ') local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('chat:addMessage', -1, { args = { _U('twt_prefix', name), rawCommand }, color = { 0, 153, 204 } }) + TriggerClientEvent('chat:addMessage', -1, { args = { _U('twt_prefix', name), args }, color = { 0, 153, 204 } }) + print(('%s: %s'):format(name, args)) end, false) RegisterCommand('me', function(source, args, rawCommand) @@ -35,11 +32,12 @@ RegisterCommand('me', function(source, args, rawCommand) return end - rawCommand = string.sub(rawCommand, 3) + args = table.concat(args, ' ') local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), rawCommand, { 255, 0, 0 }) + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), args, { 255, 0, 0 }) + print(('%s: %s'):format(name, args)) end, false) RegisterCommand('do', function(source, args, rawCommand) @@ -48,30 +46,16 @@ RegisterCommand('do', function(source, args, rawCommand) return end - rawCommand = string.sub(rawCommand, 3) + args = table.concat(args, ' ') local name = GetPlayerName(source) if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', name), rawCommand, { 0, 0, 255 }) -end, false) - -RegisterCommand('news', function(source, args, rawCommand) - if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return - end - - rawCommand = string.sub(rawCommand, 5) - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('chat:addMessage', -1, { args = { _U('news_prefix', name), rawCommand }, color = { 249, 166, 0 } }) + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', name), args, { 0, 0, 255 }) + print(('%s: %s'):format(name, args)) end, false) function GetCharacterName(source) - -- fetch identity in sync - local result = MySQL.Sync.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', - { + local result = MySQL.Sync.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', { ['@identifier'] = GetPlayerIdentifiers(source)[1] }) @@ -79,7 +63,7 @@ function GetCharacterName(source) if Config.OnlyFirstname then return result[1].firstname else - return result[1].firstname .. ' ' .. result[1].lastname + return ('%s %s'):format(result[1].firstname, result[1].lastname) end else return GetPlayerName(source) From 4b62ed9cba0078f64cd20cc19e4209f5ee20a6d5 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 9 Dec 2018 16:12:49 +0100 Subject: [PATCH 23/39] Removed chat suggestions for old commands --- client/main.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/main.lua b/client/main.lua index 3f57e522..c94a255b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -14,19 +14,15 @@ AddEventHandler('esx_rpchat:sendProximityMessage', function(playerId, title, mes end) Citizen.CreateThread(function() - TriggerEvent('chat:addSuggestion', '/ooc', _U('ooc_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) - TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) - TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) - TriggerEvent('chat:addSuggestion', '/do', _U('do_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) - TriggerEvent('chat:addSuggestion', '/news', _U('news_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), { { name = _U('generic_argument_name'), help = _U('generic_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), { { name = _U('generic_argument_name'), help = _U('generic_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/do', _U('do_help'), { { name = _U('generic_argument_name'), help = _U('generic_argument_help') } } ) end) AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then - TriggerEvent('chat:removeSuggestion', '/ooc') TriggerEvent('chat:removeSuggestion', '/twt') TriggerEvent('chat:removeSuggestion', '/me') TriggerEvent('chat:removeSuggestion', '/do') - TriggerEvent('chat:removeSuggestion', '/news') end end) From 5483cdb256b291994e6c95b735a928bba4c99569 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 9 Dec 2018 16:51:59 +0100 Subject: [PATCH 24/39] Fixed unknown command locale --- locales/cs.lua | 2 +- locales/en.lua | 2 +- locales/fi.lua | 2 +- locales/fr.lua | 2 +- locales/sv.lua | 2 +- server/main.lua | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/locales/cs.lua b/locales/cs.lua index 112d386a..fabdef61 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -8,5 +8,5 @@ Locales['cs'] = { ['do_prefix'] = 'do | %s', ['generic_argument_name'] = 'zpráva', ['generic_argument_help'] = 'zpráva', - ['generic_unknown_command'] = '^3%s^0 není platný příkaz!', + ['unknown_command'] = '^3%s^0 není platný příkaz!', } diff --git a/locales/en.lua b/locales/en.lua index fb7ad19a..e850e9c7 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -8,5 +8,5 @@ Locales['en'] = { ['do_prefix'] = 'do | %s', ['generic_argument_name'] = 'message', ['generic_argument_help'] = 'the message', - ['generic_unknown_command'] = '^3%s^0 is not a valid command!', + ['unknown_command'] = '^3%s^0 is not a valid command!', } diff --git a/locales/fi.lua b/locales/fi.lua index 92dbd9c7..e85ad38b 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -8,5 +8,5 @@ Locales['fi'] = { ['do_prefix'] = 'do | %s', ['generic_argument_name'] = 'viesti', ['generic_argument_help'] = 'viestin sisältö', - ['generic_unknown_command'] = '^3%s^0 ei ole validi komento!', + ['unknown_command'] = '^3%s^0 ei ole validi komento!', } diff --git a/locales/fr.lua b/locales/fr.lua index d2d24632..22ae4f93 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -8,5 +8,5 @@ Locales['fr'] = { ['do_prefix'] = 'faire | %s', ['generic_argument_name'] = 'message', ['generic_argument_help'] = 'le message', - ['generic_unknown_command'] = '^3%s^0 n\'est pas une commande valide!', + ['unknown_command'] = '^3%s^0 n\'est pas une commande valide!', } diff --git a/locales/sv.lua b/locales/sv.lua index 1c865a46..b79df654 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -8,5 +8,5 @@ Locales['sv'] = { ['do_prefix'] = 'gör | %s', ['generic_argument_name'] = 'meddelande', ['generic_argument_help'] = 'det meddelandet du vill skicka', - ['generic_unknown_command'] = '^3%s^0 är inte ett giltigt kommando!', + ['unknown_command'] = '^3%s^0 är inte ett giltigt kommando!', } diff --git a/server/main.lua b/server/main.lua index f77f30dd..1398997a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,6 +1,6 @@ AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) CancelEvent() - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', command_args[1]) } }) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('unknown_command', command_args[1]) } }) end) AddEventHandler('chatMessage', function(source, name, message) From 95c662d0eb9cc8f3abb967bc71b98f44785ca7de Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Mon, 18 Mar 2019 22:25:38 -0400 Subject: [PATCH 25/39] Fixed #17 --- server/main.lua | 142 ++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/server/main.lua b/server/main.lua index 1398997a..7b3ca55c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,71 +1,71 @@ -AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) - CancelEvent() - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('unknown_command', command_args[1]) } }) -end) - -AddEventHandler('chatMessage', function(source, name, message) - if string.sub(message, 1, string.len('/')) ~= '/' then - CancelEvent() - - if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('chat:addMessage', -1, { args = { _U('ooc_prefix', name), message }, color = { 128, 128, 128 } }) - end -end) - -RegisterCommand('twt', function(source, args, rawCommand) - if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return - end - - args = table.concat(args, ' ') - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('chat:addMessage', -1, { args = { _U('twt_prefix', name), args }, color = { 0, 153, 204 } }) - print(('%s: %s'):format(name, args)) -end, false) - -RegisterCommand('me', function(source, args, rawCommand) - if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return - end - - args = table.concat(args, ' ') - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), args, { 255, 0, 0 }) - print(('%s: %s'):format(name, args)) -end, false) - -RegisterCommand('do', function(source, args, rawCommand) - if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return - end - - args = table.concat(args, ' ') - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', name), args, { 0, 0, 255 }) - print(('%s: %s'):format(name, args)) -end, false) - -function GetCharacterName(source) - local result = MySQL.Sync.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', { - ['@identifier'] = GetPlayerIdentifiers(source)[1] - }) - - if result[1] and result[1].firstname and result[1].lastname then - if Config.OnlyFirstname then - return result[1].firstname - else - return ('%s %s'):format(result[1].firstname, result[1].lastname) - end - else - return GetPlayerName(source) - end -end +AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) + CancelEvent() + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('unknown_command', command_args[1]) } }) +end) + +AddEventHandler('chatMessage', function(source, name, message) + if string.sub(message, 1, string.len('/')) ~= '/' then + CancelEvent() + + if Config.EnableESXIdentity then name = GetCharacterName(source) end + TriggerClientEvent('chat:addMessage', -1, { args = { _U('ooc_prefix', name), message }, color = { 128, 128, 128 } }) + end +end) + +RegisterCommand('twt', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + + args = table.concat(args, ' ') + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('chat:addMessage', -1, { args = { _U('twt_prefix', name), args }, color = { 0, 153, 204 } }) + --print(('%s: %s'):format(name, args)) +end, false) + +RegisterCommand('me', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + + args = table.concat(args, ' ') + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), args, { 255, 0, 0 }) + --print(('%s: %s'):format(name, args)) +end, false) + +RegisterCommand('do', function(source, args, rawCommand) + if source == 0 then + print('esx_rpchat: you can\'t use this command from rcon!') + return + end + + args = table.concat(args, ' ') + local name = GetPlayerName(source) + if Config.EnableESXIdentity then name = GetCharacterName(source) end + + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', name), args, { 0, 0, 255 }) + --print(('%s: %s'):format(name, args)) +end, false) + +function GetCharacterName(source) + local result = MySQL.Sync.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', { + ['@identifier'] = GetPlayerIdentifiers(source)[1] + }) + + if result[1] and result[1].firstname and result[1].lastname then + if Config.OnlyFirstname then + return result[1].firstname + else + return ('%s %s'):format(result[1].firstname, result[1].lastname) + end + else + return GetPlayerName(source) + end +end From edc8bf4dd9797549cee9d78ed5f45638e6ce5a10 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Mon, 18 Mar 2019 22:27:36 -0400 Subject: [PATCH 26/39] Prepare Repo for 1.3.1 Release --- __resource.lua | 60 +++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/__resource.lua b/__resource.lua index d5cea34f..58c0093b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,30 +1,30 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' - -description 'ESX RP Chat' - -version '1.3.0' - -server_scripts { - '@mysql-async/lib/MySQL.lua', - '@es_extended/locale.lua', - 'locales/sv.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/cs.lua', - 'config.lua', - 'server/main.lua' -} - -client_scripts { - '@es_extended/locale.lua', - 'locales/sv.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/cs.lua', - 'config.lua', - 'client/main.lua' -} - -dependency 'es_extended' +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX RP Chat' + +version '1.3.1' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/sv.lua', + 'locales/en.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/cs.lua', + 'config.lua', + 'server/main.lua' +} + +client_scripts { + '@es_extended/locale.lua', + 'locales/sv.lua', + 'locales/en.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/cs.lua', + 'config.lua', + 'client/main.lua' +} + +dependency 'es_extended' From 7fc962a83cd478fc5bbb7f4499fc0066f374d059 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 15 Jan 2020 10:47:02 +0100 Subject: [PATCH 27/39] Removed mysql database usage --- README.md | 2 +- __resource.lua | 1 - client/main.lua | 18 +++++------ config.lua | 3 +- locales/fi.lua | 2 +- locales/fr.lua | 2 +- server/main.lua | 82 +++++++++++++++++++++++-------------------------- 7 files changed, 50 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 492ed3be..bf364c90 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ git clone https://github.com/ESX-Org/esx_rpchat [esx]/esx_rpchat ### License esx_rpchat - RP chat for ESX -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/__resource.lua b/__resource.lua index 58c0093b..0685eab3 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,7 +5,6 @@ description 'ESX RP Chat' version '1.3.1' server_scripts { - '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/sv.lua', 'locales/en.lua', diff --git a/client/main.lua b/client/main.lua index c94a255b..5beb7495 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,22 +1,20 @@ RegisterNetEvent('esx_rpchat:sendProximityMessage') AddEventHandler('esx_rpchat:sendProximityMessage', function(playerId, title, message, color) - local source = PlayerId() + local player = PlayerId() local target = GetPlayerFromServerId(playerId) - local sourcePed, targetPed = PlayerPedId(), GetPlayerPed(target) - local sourceCoords, targetCoords = GetEntityCoords(sourcePed), GetEntityCoords(targetPed) + local playerPed, targetPed = PlayerPedId(), GetPlayerPed(target) + local playerCoords, targetCoords = GetEntityCoords(playerPed), GetEntityCoords(targetPed) - if target == source then - TriggerEvent('chat:addMessage', { args = { title, message }, color = color }) - elseif GetDistanceBetweenCoords(sourceCoords, targetCoords, true) < 20 then - TriggerEvent('chat:addMessage', { args = { title, message }, color = color }) + if target == player or #(playerCoords - targetCoords) < 20 then + TriggerEvent('chat:addMessage', {args = {title, message}, color = color}) end end) Citizen.CreateThread(function() - TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), { { name = _U('generic_argument_name'), help = _U('generic_argument_help') } } ) - TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), { { name = _U('generic_argument_name'), help = _U('generic_argument_help') } } ) - TriggerEvent('chat:addSuggestion', '/do', _U('do_help'), { { name = _U('generic_argument_name'), help = _U('generic_argument_help') } } ) + TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}}) + TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}}) + TriggerEvent('chat:addSuggestion', '/do', _U('do_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}}) end) AddEventHandler('onResourceStop', function(resource) diff --git a/config.lua b/config.lua index 15e7a099..b8f2f98d 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,4 @@ -Config = {} -Config.Locale = 'en' +Config = {} Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity and want to use RP names Config.OnlyFirstname = false \ No newline at end of file diff --git a/locales/fi.lua b/locales/fi.lua index e85ad38b..8416d4e2 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -4,7 +4,7 @@ Locales['fi'] = { ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', ['me_help'] = 'teet jotain', ['me_prefix'] = 'me | %s', - ['do_help'] = 'roolipeliä tiedot', --TODO: check translation + ['do_help'] = 'roolipeliä tiedot', ['do_prefix'] = 'do | %s', ['generic_argument_name'] = 'viesti', ['generic_argument_help'] = 'viestin sisältö', diff --git a/locales/fr.lua b/locales/fr.lua index 22ae4f93..7ae7dd6f 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -4,7 +4,7 @@ Locales['fr'] = { ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', ['me_help'] = 'action personnelle', ['me_prefix'] = 'me | %s', - ['do_help'] = 'RP information', --TODO: check translation + ['do_help'] = 'RP information', ['do_prefix'] = 'faire | %s', ['generic_argument_name'] = 'message', ['generic_argument_help'] = 'le message', diff --git a/server/main.lua b/server/main.lua index 7b3ca55c..4ec542a3 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,71 +1,65 @@ AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) CancelEvent() - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('unknown_command', command_args[1]) } }) + TriggerClientEvent('chat:addMessage', source, {args = {'^1SYSTEM', _U('unknown_command', command_args[1])}}) end) -AddEventHandler('chatMessage', function(source, name, message) +AddEventHandler('chatMessage', function(playerId, playerName, message) if string.sub(message, 1, string.len('/')) ~= '/' then CancelEvent() - if Config.EnableESXIdentity then name = GetCharacterName(source) end - TriggerClientEvent('chat:addMessage', -1, { args = { _U('ooc_prefix', name), message }, color = { 128, 128, 128 } }) + local xPlayer = ESX.GetPlayerFromId(playerId) + if xPlayer then playerName = xPlayer.getName() end + TriggerClientEvent('chat:addMessage', -1, {args = {_U('ooc_prefix', playerName), message}, color = {128, 128, 128}}) end end) -RegisterCommand('twt', function(source, args, rawCommand) - if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return +RegisterCommand('twt', function(playerId, args, rawCommand) + if playerId == 0 then + print('esx_rpchat: you can\'t use this command from console!') + else + args = table.concat(args, ' ') + local playerName = GetRealPlayerName(playerId) + + TriggerClientEvent('chat:addMessage', -1, {args = {_U('twt_prefix', playerName), args}, color = {0, 153, 204}}) end - - args = table.concat(args, ' ') - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('chat:addMessage', -1, { args = { _U('twt_prefix', name), args }, color = { 0, 153, 204 } }) - --print(('%s: %s'):format(name, args)) end, false) -RegisterCommand('me', function(source, args, rawCommand) +RegisterCommand('me', function(playerId, args, rawCommand) if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return + print('esx_rpchat: you can\'t use this command from console!') + else + args = table.concat(args, ' ') + local playerName = GetRealPlayerName(playerId) + + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', playerName), args, {255, 0, 0}) end - - args = table.concat(args, ' ') - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', name), args, { 255, 0, 0 }) - --print(('%s: %s'):format(name, args)) end, false) -RegisterCommand('do', function(source, args, rawCommand) +RegisterCommand('do', function(playerId, args, rawCommand) if source == 0 then - print('esx_rpchat: you can\'t use this command from rcon!') - return + print('esx_rpchat: you can\'t use this command from console!') + else + args = table.concat(args, ' ') + local playerName = GetRealPlayerName(playerId) + + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', playerName), args, {0, 0, 255}) end - - args = table.concat(args, ' ') - local name = GetPlayerName(source) - if Config.EnableESXIdentity then name = GetCharacterName(source) end - - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', name), args, { 0, 0, 255 }) - --print(('%s: %s'):format(name, args)) end, false) -function GetCharacterName(source) - local result = MySQL.Sync.fetchAll('SELECT firstname, lastname FROM users WHERE identifier = @identifier', { - ['@identifier'] = GetPlayerIdentifiers(source)[1] - }) +function GetRealPlayerName(playerId) + local xPlayer = ESX.GetPlayerFromId(playerId) - if result[1] and result[1].firstname and result[1].lastname then - if Config.OnlyFirstname then - return result[1].firstname + if xPlayer then + if Config.EnableESXIdentity then + if Config.OnlyFirstname then + return xPlayer.get('firstName') + else + return xPlayer.getName() + end else - return ('%s %s'):format(result[1].firstname, result[1].lastname) + return xPlayer.getName() end else - return GetPlayerName(source) + return GetPlayerName(playerId) end end From b587a25c924769038ac40b116c92e0c54cb105f4 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 15 Jan 2020 10:47:18 +0100 Subject: [PATCH 28/39] Update config.lua --- config.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.lua b/config.lua index b8f2f98d..0ef102ec 100644 --- a/config.lua +++ b/config.lua @@ -1,4 +1,5 @@ Config = {} +Config.Locale = 'fr' +Config.OnlyFirstname = false Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity and want to use RP names -Config.OnlyFirstname = false \ No newline at end of file From 47a36bb9c7e9605fa4797d0b6d1dad7fbee04706 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 15 Jan 2020 10:58:08 +0100 Subject: [PATCH 29/39] Added missing ESX usage --- config.lua | 4 ++-- server/main.lua | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index 0ef102ec..610145b8 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'sv' Config.OnlyFirstname = false -Config.EnableESXIdentity = false -- only turn this on if you are using esx_identity and want to use RP names +Config.EnableESXIdentity = true -- only turn this on if you are using esx_identity and want to use RP names diff --git a/server/main.lua b/server/main.lua index 4ec542a3..3442f910 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,3 +1,7 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) CancelEvent() TriggerClientEvent('chat:addMessage', source, {args = {'^1SYSTEM', _U('unknown_command', command_args[1])}}) From 0cd967e4068ecb812326386dcda1cb014d6359ac Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:06:01 +0100 Subject: [PATCH 30/39] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (82%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 82% rename from __resource.lua rename to fxmanifest.lua index 0685eab3..692acb9e 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX RP Chat' From b50fb3ba65979f74814217b22be30fa25679243e Mon Sep 17 00:00:00 2001 From: Lorenzo Date: Tue, 11 Feb 2020 20:29:01 +0100 Subject: [PATCH 31/39] fixxxx (#35) --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 3442f910..cb3c5c11 100644 --- a/server/main.lua +++ b/server/main.lua @@ -29,7 +29,7 @@ RegisterCommand('twt', function(playerId, args, rawCommand) end, false) RegisterCommand('me', function(playerId, args, rawCommand) - if source == 0 then + if playerId == 0 then print('esx_rpchat: you can\'t use this command from console!') else args = table.concat(args, ' ') @@ -40,7 +40,7 @@ RegisterCommand('me', function(playerId, args, rawCommand) end, false) RegisterCommand('do', function(playerId, args, rawCommand) - if source == 0 then + if playerId == 0 then print('esx_rpchat: you can\'t use this command from console!') else args = table.concat(args, ' ') From 83914926b2c13d673994531e34279a48f50e7ad3 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 9 Mar 2020 13:08:34 +0100 Subject: [PATCH 32/39] Removed old invalid command handler --- locales/cs.lua | 1 - locales/en.lua | 1 - locales/fi.lua | 1 - locales/fr.lua | 1 - locales/sv.lua | 1 - server/main.lua | 8 +------- 6 files changed, 1 insertion(+), 12 deletions(-) diff --git a/locales/cs.lua b/locales/cs.lua index fabdef61..eccbecb3 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -8,5 +8,4 @@ Locales['cs'] = { ['do_prefix'] = 'do | %s', ['generic_argument_name'] = 'zpráva', ['generic_argument_help'] = 'zpráva', - ['unknown_command'] = '^3%s^0 není platný příkaz!', } diff --git a/locales/en.lua b/locales/en.lua index e850e9c7..ab717d9e 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -8,5 +8,4 @@ Locales['en'] = { ['do_prefix'] = 'do | %s', ['generic_argument_name'] = 'message', ['generic_argument_help'] = 'the message', - ['unknown_command'] = '^3%s^0 is not a valid command!', } diff --git a/locales/fi.lua b/locales/fi.lua index 8416d4e2..d76bde47 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -8,5 +8,4 @@ Locales['fi'] = { ['do_prefix'] = 'do | %s', ['generic_argument_name'] = 'viesti', ['generic_argument_help'] = 'viestin sisältö', - ['unknown_command'] = '^3%s^0 ei ole validi komento!', } diff --git a/locales/fr.lua b/locales/fr.lua index 7ae7dd6f..edb9e02a 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -8,5 +8,4 @@ Locales['fr'] = { ['do_prefix'] = 'faire | %s', ['generic_argument_name'] = 'message', ['generic_argument_help'] = 'le message', - ['unknown_command'] = '^3%s^0 n\'est pas une commande valide!', } diff --git a/locales/sv.lua b/locales/sv.lua index b79df654..5dd7fb02 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -8,5 +8,4 @@ Locales['sv'] = { ['do_prefix'] = 'gör | %s', ['generic_argument_name'] = 'meddelande', ['generic_argument_help'] = 'det meddelandet du vill skicka', - ['unknown_command'] = '^3%s^0 är inte ett giltigt kommando!', } diff --git a/server/main.lua b/server/main.lua index cb3c5c11..6671e76d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,17 +2,11 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('es:invalidCommandHandler', function(source, command_args, user) - CancelEvent() - TriggerClientEvent('chat:addMessage', source, {args = {'^1SYSTEM', _U('unknown_command', command_args[1])}}) -end) - AddEventHandler('chatMessage', function(playerId, playerName, message) if string.sub(message, 1, string.len('/')) ~= '/' then CancelEvent() - local xPlayer = ESX.GetPlayerFromId(playerId) - if xPlayer then playerName = xPlayer.getName() end + playerName = GetRealPlayerName(playerId) TriggerClientEvent('chat:addMessage', -1, {args = {_U('ooc_prefix', playerName), message}, color = {128, 128, 128}}) end end) From d99cfff4f288cfa8e4469e8f525b636ff8aec4aa Mon Sep 17 00:00:00 2001 From: Jimmy Bassy <38838740+JimmyBassy@users.noreply.github.com> Date: Sun, 28 Jun 2020 23:12:24 +0200 Subject: [PATCH 33/39] Fix for the new es_extended + feature Fix for the proximity BUG with the new ESX, and added feature for anonymous tweets, using the command /anontwt --- client/main.lua | 8 ++++++-- server/main.lua | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index 5beb7495..68895782 100644 --- a/client/main.lua +++ b/client/main.lua @@ -3,8 +3,10 @@ AddEventHandler('esx_rpchat:sendProximityMessage', function(playerId, title, mes local player = PlayerId() local target = GetPlayerFromServerId(playerId) - local playerPed, targetPed = PlayerPedId(), GetPlayerPed(target) - local playerCoords, targetCoords = GetEntityCoords(playerPed), GetEntityCoords(targetPed) + local playerPed = PlayerPedId() + local targetPed = GetPlayerPed(target) + local playerCoords = GetEntityCoords(playerPed) + local targetCoords = GetEntityCoords(targetPed) if target == player or #(playerCoords - targetCoords) < 20 then TriggerEvent('chat:addMessage', {args = {title, message}, color = color}) @@ -13,6 +15,7 @@ end) Citizen.CreateThread(function() TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}}) + TriggerEvent('chat:addSuggestion', '/anontwt', _U('twtanon_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}}) TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}}) TriggerEvent('chat:addSuggestion', '/do', _U('do_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}}) end) @@ -24,3 +27,4 @@ AddEventHandler('onResourceStop', function(resource) TriggerEvent('chat:removeSuggestion', '/do') end end) + diff --git a/server/main.lua b/server/main.lua index 6671e76d..876bbb1e 100644 --- a/server/main.lua +++ b/server/main.lua @@ -16,12 +16,25 @@ RegisterCommand('twt', function(playerId, args, rawCommand) print('esx_rpchat: you can\'t use this command from console!') else args = table.concat(args, ' ') + local playerName = GetRealPlayerName(playerId) TriggerClientEvent('chat:addMessage', -1, {args = {_U('twt_prefix', playerName), args}, color = {0, 153, 204}}) end end, false) +RegisterCommand('anontwt', function(playerId, args, rawCommand) + if playerId == 0 then + print('esx_rpchat: you can\'t use this command from console!') + else + args = table.concat(args, ' ') + + local playerName = GetRealPlayerName(playerId) + + TriggerClientEvent('chat:addMessage', -1, {args = {_U('twt_prefix', "Anonymous"), args}, color = {0, 153, 204}}) + end +end, false) + RegisterCommand('me', function(playerId, args, rawCommand) if playerId == 0 then print('esx_rpchat: you can\'t use this command from console!') @@ -29,7 +42,7 @@ RegisterCommand('me', function(playerId, args, rawCommand) args = table.concat(args, ' ') local playerName = GetRealPlayerName(playerId) - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', playerName), args, {255, 0, 0}) + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, playerId, _U('me_prefix', playerName), args, {255, 0, 0}) end end, false) @@ -40,7 +53,7 @@ RegisterCommand('do', function(playerId, args, rawCommand) args = table.concat(args, ' ') local playerName = GetRealPlayerName(playerId) - TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', playerName), args, {0, 0, 255}) + TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, playerId, _U('do_prefix', playerName), args, {0, 0, 255}) end end, false) From 2856cf44235b55d745aa7c547b799f88822d4786 Mon Sep 17 00:00:00 2001 From: Jimmy Bassy <38838740+JimmyBassy@users.noreply.github.com> Date: Sun, 28 Jun 2020 23:14:04 +0200 Subject: [PATCH 34/39] Create es.lua --- locales/es.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 locales/es.lua diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..315c6467 --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,12 @@ +Locales['es'] = { + ['ooc_prefix'] = 'OOC | %s', + ['twt_help'] = 'Mandar tweet', + ['twtanon_help'] = 'Mandar tweet anonimo', + ['twt_prefix'] = '^0[^4Twitter^0] (^5@%s^0)', + ['me_help'] = 'Accion Global', + ['me_prefix'] = 'me | %s', + ['do_help'] = 'Accion Personal', + ['do_prefix'] = 'do | %s', + ['generic_argument_name'] = 'mensaje', + ['generic_argument_help'] = 'el mensaje', +} From ac2193dc0a8020371202b88d374f85f6217842d5 Mon Sep 17 00:00:00 2001 From: Lincon <59184093+ItsLincon@users.noreply.github.com> Date: Tue, 29 Sep 2020 02:18:07 +0200 Subject: [PATCH 35/39] Updated private messages to ESX 1.2 --- server/main.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/server/main.lua b/server/main.lua index 6671e76d..21236cc1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -44,6 +44,21 @@ RegisterCommand('do', function(playerId, args, rawCommand) end end, false) +RegisterCommand('msg', function(source, args, user) + + if GetPlayerName(tonumber(args[1])) then + local player = tonumber(args[1]) + table.remove(args, 1) + + TriggerClientEvent('chat:addMessage', player, {args = {"^1MSG de "..GetPlayerName(source).. "[" .. source .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) + TriggerClientEvent('chat:addMessage', source, {args = {"^1MSG enviado a "..GetPlayerName(player).. "[" .. player .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) + + else + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "ID de jugador incorrecta!") + end + +end,false) + function GetRealPlayerName(playerId) local xPlayer = ESX.GetPlayerFromId(playerId) From 26c229b20783c5622df3a7298acba674c9bd36d8 Mon Sep 17 00:00:00 2001 From: Lincon <59184093+ItsLincon@users.noreply.github.com> Date: Tue, 29 Sep 2020 02:38:44 +0200 Subject: [PATCH 36/39] Added english lang to pm --- server/main.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/main.lua b/server/main.lua index 21236cc1..cbb88722 100644 --- a/server/main.lua +++ b/server/main.lua @@ -50,9 +50,10 @@ RegisterCommand('msg', function(source, args, user) local player = tonumber(args[1]) table.remove(args, 1) - TriggerClientEvent('chat:addMessage', player, {args = {"^1MSG de "..GetPlayerName(source).. "[" .. source .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) - TriggerClientEvent('chat:addMessage', source, {args = {"^1MSG enviado a "..GetPlayerName(player).. "[" .. player .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) - + ESP --TriggerClientEvent('chat:addMessage', player, {args = {"^1MSG de "..GetPlayerName(source).. "[" .. source .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) + ESP --TriggerClientEvent('chat:addMessage', source, {args = {"^1MSG enviado a "..GetPlayerName(player).. "[" .. player .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) + ENG TriggerClientEvent('chat:addMessage', player, {args = {"^1PM from "..GetPlayerName(source).. "[" .. source .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) + ENG TriggerClientEvent('chat:addMessage', source, {args = {"^1PM SEND TO "..GetPlayerName(player).. "[" .. player .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) else TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "ID de jugador incorrecta!") end From 1c7b98ae4146f6fab4a5bb9063defe4c60069412 Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:40:59 +0000 Subject: [PATCH 37/39] Update config.lua Changed default language to english as its the universal language --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 610145b8..17fdaefd 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'sv' +Config.Locale = 'en' Config.OnlyFirstname = false Config.EnableESXIdentity = true -- only turn this on if you are using esx_identity and want to use RP names From 27a1eaab6a9ab26ccd2ef89e1ee41bcf087ec873 Mon Sep 17 00:00:00 2001 From: Ark Date: Mon, 1 Feb 2021 16:28:47 -0600 Subject: [PATCH 38/39] (fix): syntax error --- server/main.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/main.lua b/server/main.lua index 44d2917c..e3a6da3d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -62,11 +62,9 @@ RegisterCommand('msg', function(source, args, user) if GetPlayerName(tonumber(args[1])) then local player = tonumber(args[1]) table.remove(args, 1) - - ESP --TriggerClientEvent('chat:addMessage', player, {args = {"^1MSG de "..GetPlayerName(source).. "[" .. source .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) - ESP --TriggerClientEvent('chat:addMessage', source, {args = {"^1MSG enviado a "..GetPlayerName(player).. "[" .. player .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) - ENG TriggerClientEvent('chat:addMessage', player, {args = {"^1PM from "..GetPlayerName(source).. "[" .. source .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) - ENG TriggerClientEvent('chat:addMessage', source, {args = {"^1PM SEND TO "..GetPlayerName(player).. "[" .. player .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) + + TriggerClientEvent('chat:addMessage', player, {args = {"^1PM from "..GetPlayerName(source).. "[" .. source .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) + TriggerClientEvent('chat:addMessage', source, {args = {"^1PM SEND TO "..GetPlayerName(player).. "[" .. player .. "]: ^7" ..table.concat(args, " ")}, color = {255, 153, 0}}) else TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "ID de jugador incorrecta!") end From 1ccceaa4ff5bc9cbb2d334a3bd3a0cd5fa1fd902 Mon Sep 17 00:00:00 2001 From: SMVampire Date: Sun, 2 May 2021 17:07:21 -0400 Subject: [PATCH 39/39] Fix Issues with Very Far Msgs Showing Even though playerID var returns valid, sometimes GetPlayerFromServerId() fails and returns -1. This checks for that and prevents those messages from showing. Might be related to OneSync --- client/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 68895782..308233cb 100644 --- a/client/main.lua +++ b/client/main.lua @@ -8,8 +8,10 @@ AddEventHandler('esx_rpchat:sendProximityMessage', function(playerId, title, mes local playerCoords = GetEntityCoords(playerPed) local targetCoords = GetEntityCoords(targetPed) - if target == player or #(playerCoords - targetCoords) < 20 then - TriggerEvent('chat:addMessage', {args = {title, message}, color = color}) + if target ~= -1 then + if target == player or #(playerCoords - targetCoords) < 20 then + TriggerEvent('chat:addMessage', {args = {title, message}, color = color}) + end end end)