From 7ced8e30d5f59757ec880fe1563c283ef27779fd Mon Sep 17 00:00:00 2001
From: syvalamarek <72654834+syvalamarek@users.noreply.github.com>
Date: Mon, 24 Apr 2023 20:26:28 +0200
Subject: [PATCH 1/4] Main commit
---
.DS_Store | Bin 0 -> 6148 bytes
Config.json | 9 +
LICENSE.md | 674 ----------------------------------------------
Main.py | 154 +++++++++++
README.md | 128 ++-------
Region_emoji.json | 30 +++
SufRetriever.py | 228 ----------------
requirements.txt | Bin 282 -> 59 bytes
8 files changed, 208 insertions(+), 1015 deletions(-)
create mode 100644 .DS_Store
create mode 100644 Config.json
delete mode 100644 LICENSE.md
create mode 100644 Main.py
create mode 100644 Region_emoji.json
delete mode 100644 SufRetriever.py
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3564a9d8fead2306c22d882780a589365677a8bf
GIT binary patch
literal 6148
zcmeHKJx{|h5PesQDC!ax#DbJRKqWTDP?CXx1tun-6i}-s;iHvc%g&GCC&D}1R80aa
zLe-sgerM;N?L1p?3_ym9@gWca=+PBB+bn)CeXicJPH5RAitA&72MjR93(8iuHT*{f
zbnW^$;d&Lg$LjhOr?c{QG%H8U(Cu+dzx;H@2-w0IZpbLO;*WT1WPdcW`#49&K2owW
z9N>to9OF8xvrE=sWsDuN?zpEWZhlvcb4F9vzjs+556f%A@;quy9uZVwcU%
z80*iXa^iqVz{(?^(8N=To+{yrA)e0mIOHV(E03NI36~EEBTKlUh#Q^#$1WX`c(l?K
zFa_!gZ1`%V=YRJ5{l8AKnkirktd#=NO)t_RUn!iet(ViYHl|
- 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.
-
-
- Copyright (C)
-
- 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:
-
- Copyright (C)
- 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/Main.py b/Main.py
new file mode 100644
index 0000000..e551fff
--- /dev/null
+++ b/Main.py
@@ -0,0 +1,154 @@
+import json, os, time, discord, threading, datetime, requests
+from discord_webhook import DiscordEmbed, DiscordWebhook
+
+intents = discord.Intents().all()
+client = discord.Bot(intents = intents)
+
+with open(os.getcwd() + '/Config.json') as f:
+ data = json.load(f)
+ region_list = data['region_list']
+ bot_token = data['bot_token']
+ embed_footer_text = data['embed_footer_text']
+ embed_author_url = data['embed_author_url']
+ embed_color = data['embed_color']
+ webhook_url = data['webhook_url']
+ delay = data['monitor_delay']
+
+def get_raffles(region):
+ product_data = []
+ headers = {
+ 'Pragma': 'no-cache',
+ 'Accept': '*/*',
+ 'Cache-Control': 'no-cache',
+ 'Host': 'www.soleretriever.com',
+ 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15',
+ }
+
+ params = {
+ 'term': '',
+ 'from': '0',
+ 'limit': '24',
+ 'locales': region.upper(),
+ 'types': '',
+ 'isHideEntered': 'true',
+ }
+
+ response = requests.get('https://www.soleretriever.com/api/products/raffles', params=params, headers=headers)
+ if response.status_code == 200:
+ data_json = json.loads(response.text)
+ for product in data_json['products']:
+ product_slug = product['slug']
+ for raffle in product['raffle']:
+ product_raffle = str(raffle['id'])
+ product_data.append([product_slug, product_raffle])
+
+ return product_data
+
+def get_raffle_details(product_data, region_data):
+ headers = {
+ 'Pragma': 'no-cache',
+ 'Accept': '*/*',
+ 'Cache-Control': 'no-cache',
+ 'Host': 'www.soleretriever.com',
+ 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15',
+ }
+
+ response = requests.get(
+ f'https://www.soleretriever.com/raffles/{product_data[0]}/raffle/{product_data[1]}',
+ headers=headers,
+ )
+
+ if response.status_code == 200:
+ response_data = response.text.split('')[0]
+ data_json = json.loads(response_data)['props']['pageProps']['raffleData']
+
+ raffle_url = data_json['url']
+ raffle_type = data_json['type']
+ raffle_pickup = data_json['isPickup']
+ raffle_shipping = data_json['hasPostage']
+ raffle_end = data_json['endDate']
+ product_sku = data_json['product']['pid']
+ product_name = data_json['product']['name']
+ product_image = data_json['product']['imageUrl']
+ raffle_store= data_json['retailer']['name']
+
+ webhook = DiscordWebhook(url = webhook_url)
+ embed = DiscordEmbed(title = f'{product_name}', url = f'https://www.soleretriever.com/raffles/{product_data[0]}/raffle/{product_data[1]}', color = int(embed_color), description=f'> New Raffle Live For {region_data["name"]} :{region_data["flag"]}:')
+ embed.set_thumbnail(url = product_image)
+ embed.set_footer(text = f'SoleRetriever Monitor by {embed_footer_text} \U000000B7 {datetime.datetime.now()}')
+ embed.add_embed_field(name = 'Product SKU: ', value = f'`{product_sku}`')
+
+ if raffle_type == 'In app':
+ embed.add_embed_field(name = 'Raffle Type: ', value = 'In App :mobile_phone:')
+ elif raffle_type == 'Online':
+ embed.add_embed_field(name = 'Raffle Type: ', value = 'Online :desktop:')
+ elif raffle_type == 'In store':
+ embed.add_embed_field(name = 'Raffle Type: ', value = 'Instore :shopping_cart:')
+
+ if raffle_pickup == True:
+ embed.add_embed_field(name = 'Delivery:', value = 'Instore Pickup :door:')
+ if raffle_shipping == True:
+ embed.add_embed_field(name = 'Delivery:', value = 'Shipping :package:')
+
+ embed.add_embed_field(name = 'Store:', value = raffle_store)
+ embed.add_embed_field(name = 'Closing: ', value = f'')
+ embed.add_embed_field(name = 'Entry:', value = f'[ENTER HERE]({raffle_url})')
+ embed.add_embed_field(name = 'Links:', value = f'[Restocks](https://restocks.net/en/shop/?q={product_sku}) | [StockX](https://stockx.com/search?s={product_sku}) | [Goat](https://www.goat.com/search?query={product_sku}) | [FlightClub](https://www.flightclub.com/catalogsearch/result?query={product_sku})', inline=False)
+ webhook.add_embed(embed)
+ webhook.execute()
+
+ return
+
+@client.event
+async def on_ready():
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f] Bot Is Ready"))
+
+ for region in region_list:
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f | Region: {region}] Starting..."))
+ with open(os.getcwd() + '/Region_emoji.json') as f:
+ region_emoji = json.load(f)
+ region_data = region_emoji[region]
+ t1 = threading.Thread(target=main, args=(region,region_data)).start()
+
+def main(region,region_data):
+ initial_data = get_raffles(region)
+ while True:
+ monitor_data = get_raffles(region)
+
+ if monitor_data != initial_data:
+ for raffle in monitor_data:
+ if raffle not in initial_data:
+ get_raffle_details(raffle, region_data)
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f | Region: {region}] New Raffle Live: {raffle[0]}"))
+
+ time.sleep(3)
+
+ initial_data = monitor_data
+
+ else:
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f | Region: {region}] Waiting For New Raffles"))
+
+ time.sleep(delay)
+
+@client.slash_command(description = 'Testing')
+async def webhook_test(ctx: discord.ApplicationContext):
+ await ctx.defer(ephemeral=True)
+ try:
+ raffle = get_raffles(region_list[0])
+ get_raffle_details(raffle[0])
+ await ctx.respond('Testing Succesful', ephemeral=True)
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f] Successfully Send Testing Webhook"))
+
+ except Exception as e:
+ await ctx.respond(f'Error: {str(e)}', ephemeral=True)
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f] Error Sending Testing Webhook. Error: {str(e)}"))
+
+@client.event
+async def on_message(message: discord.Interaction):
+ if message.channel.id == 1100043271503351858:
+ await message.add_reaction("<โ
>")
+
+ else:
+ pass
+
+client.run(data['bot_token'])
\ No newline at end of file
diff --git a/README.md b/README.md
index cec0bb1..2692b81 100644
--- a/README.md
+++ b/README.md
@@ -1,114 +1,16 @@
-
-
-
-
-
-
Sole Retriever Raffle Monitor
-
- A Web Monitor that Notifies you through Discord Webhook when a New Raffle is Added to Sole Retriever
-
- Report Bug
- ยท
- Request Feature
-
-
-
-
-
-
-
-
-
-
-Please **star** this repository to increase the awareness of the project for others to use or add to.
-
-Join the Discord Server YasCommunity for Code, Sneakers and Everything in-between! Join [here](https://discord.gg/b6zyJyCQUu)
-
-
-
-
-
-
-
-
-
-
-
-# Suf Retriever Discord Bot ๐ค
-
-
-
-
-Suf Retriever is a **Discord bot** that monitors and notifies users about new sneaker raffles on the [Sole Retriever](https://www.soleretriever.com/) website. It fetches the latest raffle data and sends a notification through a webhook with an embedded message, including the raffle details such as region, delivery method & raffle type.
-
-## ๐ Features
-
-- Monitors New Sneaker Raffles on Sole Retriever
-- Sends notifications with Embedded Messages through a Discord Webhook
-- Supports a Test Command for Manual Testing `!test` .Type this in the Discord Channel
-
-## ๐ Setup and Installation
-
-1. Make Sure you have Python Installed. Then Install the required Python packages in using Command Prompt or Terminal:
- Python and PIP installation guides can be found in the Discord server [here](https://discord.gg/b6zyJyCQUu).
- ```
- pip install -r requirements.txt
- ```
-
-2. Open the SufRetriever.py file in an IDE or a Text Editior such as NotePad and add your Discord Bot token:
-
- A guide on How to get a Bot Token Can be found [here](https://discordgsm.com/guide/how-to-get-a-discord-bot-token).
-
- LEAVE THE TOKEN WITHIN THE APOSTROPHES
- ```
- TOKEN=your_discord_bot_token_here
- ```
-
- Replace `your_discord_bot_token_here` with your actual Discord bot token.
-
-3. Set the `WEBHOOK_URL` variable in the script to the webhook URL you created in your Discord server.
-
- A guide on How to get a Webhook Can be found [here](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
-
- LEAVE THE WEBHOOK WITHIN THE APOSTROPHES
- ```
- TOKEN=your_discord_webhook_here
- ```
-
-4. Open a terminal or command prompt and navigate to the directory containing the bot script using the `cd` command:
-
- ```
- cd path/to/your/bot/script
- ```
-
- Replace `path/to/your/bot/script` with the actual path to the directory containing the bot script.
-
- For example, if the script is located in `C:\Users\YourUsername\Documents\DiscordBots\SufRetriever`, you would type:
-
- ```
- cd C:\Users\YourUsername\Documents\DiscordBots\SufRetriever
- ```
-
- Once you are in the correct directory, run the bot script:
-
- ```
- python SufRetriever.py
- ```
- or if on Mac:
- ```
- python3 SufRetriever.py
- ```
-
-
- Replace `bot_script.py` with the name of the Python script containing the bot code.
-
-
-
-## ๐ Commands
-
-- `!test`: Sends a test webhook notification with a pre-defined raffle URL. This command can be used to check if the webhook and embed formatting are working correctly.
-
-## ๐ License
-
-Distributed under the GNU General Public License v3.0 License. See [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html) for more information..
+Example Config.json
+```json
+{
+ "region_list": ["EU", "JP", "WW", "MY", "AU"],
+ "bot_token": "OTY2Nzg3NjAxODAzNjQ5MDg0.YmG1Hg.2QnsnqrfDjNL",
+ "embed_footer_text": "je_mi_to_burt#2604",
+ "embed_author_url": "https://i.imgur.com/rdWuZBR.png",
+ "embed_color": "7180222",
+ "webhook_url": "https://discord.com/api/webhooks/...",
+ "monitor_delay": 60
+}
+```
+
+* embed color needs to be decimal value, convert hex to decimal [Here](https://www.colorhexa.com/)
+* monitor delay is in seconds
diff --git a/Region_emoji.json b/Region_emoji.json
new file mode 100644
index 0000000..7ce6215
--- /dev/null
+++ b/Region_emoji.json
@@ -0,0 +1,30 @@
+{
+ "JP": {
+ "name": "Japan",
+ "flag": "flag_jp"
+ },
+ "US": {
+ "name": "United States",
+ "flag": "flag_us"
+ },
+ "AU": {
+ "name": "Australia",
+ "flag": "flag_au"
+ },
+ "EU": {
+ "name": "Europe",
+ "flag": "flag_eu"
+ },
+ "MY": {
+ "name": "Malasia",
+ "flag": "flag_my"
+ },
+ "WW": {
+ "name": "Worldwide",
+ "flag": "globe_with_meridians"
+ },
+ "CA": {
+ "name": "Canada",
+ "flag": "flag_ca"
+ }
+}
\ No newline at end of file
diff --git a/SufRetriever.py b/SufRetriever.py
deleted file mode 100644
index 1d217bb..0000000
--- a/SufRetriever.py
+++ /dev/null
@@ -1,228 +0,0 @@
-import json, re
-from datetime import datetime
-
-import discord
-from discord.ext import commands, tasks
-from discord import Embed
-
-import requests
-from bs4 import BeautifulSoup
-import cfscrape
-
-from pycountry_convert import country_name_to_country_alpha2
-import emoji
-
-from dotenv import load_dotenv
-
-
-WEBHOOK_URL = 'your_discord_webhook_here'
-load_dotenv()
-TOKEN = 'your_discord_bot_token_here'
-
-intents = discord.Intents.all()
-intents.typing = False
-intents.presences = False
-
-bot = commands.Bot(command_prefix='!', intents=intents)
-
-raffle_ids = set()
-
-async def initialize_raffle_ids():
- initial_raffles = await fetch_raffles()
- for product in initial_raffles:
- for raffle in product["raffle"]:
- raffle_id = raffle["id"]
- raffle_ids.add(raffle_id)
-
-@bot.event
-async def on_ready():
- print(f'{bot.user.name} has connected to Discord!')
- await initialize_raffle_ids()
- check_raffles.start()
-
-def get_retailer_name(raffle_url):
- # Create a Cloudflare scraper object
- scraper = cfscrape.create_scraper()
-
- # Use the scraper object to get the page content
- response = scraper.get(raffle_url)
-
- if response.status_code != 200:
- print(f"Failed to fetch raffle page at {raffle_url}")
- return None
-
- soup = BeautifulSoup(response.text, 'html.parser')
- retailer_name_element = soup.find('a', class_="flex items-center")
-
- if retailer_name_element is not None:
- retailer_name = retailer_name_element.find('h2').text.replace("Raffle by ", "").strip()
- return retailer_name
- else:
- print("Failed to find retailer name.")
- return None
-
-async def fetch_raffles():
- url = "https://www.soleretriever.com/api/products/raffles?term=&from=0&limit=24&locales=&types=&isHideEntered=true"
- headers = {
- "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.111 Safari/537.36"
- }
- response = requests.get(url, headers=headers)
-
- try:
- response.raise_for_status()
- if response.text:
- data = json.loads(response.text)
- products = data["products"]
- return products
- else:
- print("Error fetching raffles: Empty response.")
- return []
- except requests.exceptions.HTTPError as e:
- print(f"Error fetching raffles: {e}")
- return []
-
-def extract_raffle_information(soup):
- start_date_label = "Start date"
- close_date_label = "Close date"
- type_label = "Type"
- region_label = "Region"
- retrieval_label = "Retrieval"
-
- start_date = soup.find("div", string=lambda text: text and text.strip() == start_date_label).find_next_sibling("div").text.strip()
- close_date = soup.find("div", string=lambda text: text and text.strip() == close_date_label).find_next_sibling("div").text.strip()
- raffle_type = soup.find("div", string=lambda text: text and text.strip() == type_label).find_next_sibling("div").text.strip()
- region = soup.find("div", string=lambda text: text and text.strip() == region_label).find_next_sibling("div").text.strip()
- retrieval = soup.find("div", string=lambda text: text and text.strip() == retrieval_label).find_next_sibling("div").text.strip()
-
- return start_date, close_date, raffle_type, region, retrieval
-
-
-async def send_embedded_message(title, url, image_url, raffle_url, retailer_name, price):
- # Create a Cloudflare scraper object
- scraper = cfscrape.create_scraper()
- # Use the scraper object to get the page content
- raffle_response = scraper.get(raffle_url)
- raffle_soup = BeautifulSoup(raffle_response.content, "html.parser")
-
- # Extract the required information
- start_date, close_date, raffle_type, region, retrieval = extract_raffle_information(raffle_soup)
-
- embed = Embed(title=title, url=url,description=f"A new raffle for [{title}]({url}) is live!", color=0x68CD89)
- embed.set_thumbnail(url=image_url)
-
- flag_emoji=get_flag_emoji(region)
-
-
- embed.add_field(name="Region", value=f"{flag_emoji} {region}", inline=True)
- embed.add_field(name="Type", value=raffle_type, inline=True)
- embed.add_field(name="Store", value=retailer_name, inline=True)
- embed.add_field(name="Open", value=start_date, inline=True)
- embed.add_field(name="Close", value=close_date, inline=True)
- embed.add_field(name="Delivery", value=get_delivery_emoji(retrieval), inline=True)
- embed.add_field(name="Entry:", value=f"[Enter at {retailer_name}]({raffle_url})", inline=True)
- embed.add_field(name="Price:", value=f"${price}", inline=True)
-
- embed.set_footer(text="Suf Retriever", icon_url="https://cdn.discordapp.com/attachments/692518598241026139/1098991992085696592/download_2.png")
- embed.timestamp = datetime.utcnow()
-
- webhook_payload = {
- "embeds": [embed.to_dict()],
- "username": "Suf Retriever",
- "avatar_url": "https://cdn.discordapp.com/attachments/692518598241026139/1098991992085696592/download_2.png",
- }
- response = requests.post(WEBHOOK_URL, json=webhook_payload)
- response.raise_for_status()
-
-
-
-def get_flag_emoji(region):
- region_flags = {
- "Europe": "๐ช๐บ",
- "Worldwide": "๐",
- }
-
- # Check if the region is in the region_flags dictionary
- if region in region_flags:
- return region_flags[region]
-
- # If it's a country, find the corresponding flag emoji
- try:
- country_code = country_name_to_country_alpha2(region)
- flag_emoji = emoji.emojize(f":flag_{country_code.lower()}:")
- return flag_emoji
- except KeyError:
- # If the region is not found, return an empty string
- return ""
-
-def get_delivery_emoji(retrieval):
- if retrieval.lower() == "shipping":
- return ":package: " + retrieval
- elif retrieval.lower() == "in store pickup":
- return ":door: " + retrieval
- else:
- return ":white_check_mark: " + retrieval
-
-
-@tasks.loop(minutes=1)
-async def check_raffles():
- new_raffles = await fetch_raffles()
-
- for product in new_raffles:
- product_name = product["name"]
- brand_slug = product["shoeBrand"]["slug"]
- model_slug = product["shoeModel"]["slug"] if product["shoeModel"] is not None else None
- product_slug = product["slug"]
- product_url = f"https://www.soleretriever.com/sneaker-release-dates/{brand_slug}/{model_slug}/{product_slug}" if model_slug is not None else None
- product_image_url = product["imageUrl"]
- price = product["price"]
-
- for raffle in product["raffle"]:
- raffle_id = raffle["id"]
- if raffle_id not in raffle_ids:
- raffle_ids.add(raffle_id)
- raffle_url = f"https://www.soleretriever.com/raffles/{product_slug}/raffle/{raffle_id}" if model_slug is not None else None
- retailer_name = get_retailer_name(raffle_url) if raffle_url is not None else None
- await send_embedded_message(f"{product_name}:", product_url, product_image_url, raffle_url, retailer_name, price)
- print("Raffle's are being Checked for Updates")
-
-@bot.command()
-async def test(ctx):
- #Test only works for Raffle URLs on the first page as those are the only ones on the Json
- test_raffle_url = "https://www.soleretriever.com/raffles/new-balance-990v2-miusa-season-2-brown-m990bb2/raffle/81564"
-
- # Extract the product slug from the test_raffle_url
- match = re.search(r'raffles/(.+?)/raffle', test_raffle_url)
- if match:
- product_slug = match.group(1)
- else:
- await ctx.send("Invalid URL format.")
- return
-
- # Get product details from fetch_raffles()
- products = await fetch_raffles()
- test_product = None
- for product in products:
- if product_slug in product["slug"]:
- test_product = product
- break
-
- if test_product:
- test_product_name = test_product["name"]
- test_product_url = f"https://www.soleretriever.com/sneaker-release-dates/{test_product['shoeBrand']['slug']}/{test_product['shoeModel']['slug']}/{test_product['slug']}"
- test_image_url = test_product["imageUrl"]
- test_price = test_product["price"]
- title = f"{test_product_name}"
- test_retailer_name = get_retailer_name(test_raffle_url)
- await send_embedded_message(title, test_product_url, test_image_url, test_raffle_url, test_retailer_name,test_price)
- await ctx.send("Test webhook sent.")
- else:
- await ctx.send("Test failed.")
-
-
-
-
-@check_raffles.before_loop
-async def before_check_raffles():
- await bot.wait_until_ready()
-
-bot.run(TOKEN)
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index aa0aee6e8a5b70a39d49c6eca90e11e4722ebbdb..53f9422238cc620a6f8420c4cff237b80e085a6f 100644
GIT binary patch
literal 59
zcmYevEKbfZO3^E*w6!(T146D8h)8^SYEnjiezvWxfu5nco&i@;YGG+=aY->)orRtu
F7XVH;5`6#w
literal 282
zcmYL^(F(#a3`Os=;HN0A4D`j1(XHY{ZLOWKpI1*Rb(FMCa+2J9-n|Ar)hQ^c*IH4N
z_8iCmXG<+gH0um?*9tBu%kzH~wt?LgGxkX4pb=uwiT6tXz#G*Tx`k{wb{pS8nSw-B
zq_$3
Date: Fri, 28 Apr 2023 19:35:43 +0200
Subject: [PATCH 2/4] Update Main.py
---
Main.py | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/Main.py b/Main.py
index e551fff..8159084 100644
--- a/Main.py
+++ b/Main.py
@@ -14,6 +14,9 @@
webhook_url = data['webhook_url']
delay = data['monitor_delay']
+with open(os.getcwd() + '/Region_emoji.json') as f:
+ region_emoji = json.load(f)
+
def get_raffles(region):
product_data = []
headers = {
@@ -54,7 +57,7 @@ def get_raffle_details(product_data, region_data):
}
response = requests.get(
- f'https://www.soleretriever.com/raffles/{product_data[0]}/raffle/{product_data[1]}',
+ f'https://www.soleretriever.com/raffles/{str(product_data[0])}/raffle/{str(product_data[1])}',
headers=headers,
)
@@ -73,7 +76,7 @@ def get_raffle_details(product_data, region_data):
raffle_store= data_json['retailer']['name']
webhook = DiscordWebhook(url = webhook_url)
- embed = DiscordEmbed(title = f'{product_name}', url = f'https://www.soleretriever.com/raffles/{product_data[0]}/raffle/{product_data[1]}', color = int(embed_color), description=f'> New Raffle Live For {region_data["name"]} :{region_data["flag"]}:')
+ embed = DiscordEmbed(title = f'{str(product_name)}', url = f'https://www.soleretriever.com/raffles/{str(product_data[0])}/raffle/{str(product_data[1])}', color = int(embed_color), description=f'> New Raffle Live For {str(region_emoji[region_data]["name"])} :{str(region_emoji[region_data]["flag"])}:')
embed.set_thumbnail(url = product_image)
embed.set_footer(text = f'SoleRetriever Monitor by {embed_footer_text} \U000000B7 {datetime.datetime.now()}')
embed.add_embed_field(name = 'Product SKU: ', value = f'`{product_sku}`')
@@ -130,25 +133,27 @@ def main(region,region_data):
time.sleep(delay)
-@client.slash_command(description = 'Testing')
+@client.slash_command(description = 'Command To Test Webhook')
async def webhook_test(ctx: discord.ApplicationContext):
await ctx.defer(ephemeral=True)
try:
raffle = get_raffles(region_list[0])
- get_raffle_details(raffle[0])
+ get_raffle_details(raffle[0], region_list[0])
await ctx.respond('Testing Succesful', ephemeral=True)
- print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f] Successfully Send Testing Webhook"))
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f | Region: {region_list[0]}] Successfully Send Testing Webhook"))
except Exception as e:
await ctx.respond(f'Error: {str(e)}', ephemeral=True)
- print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f] Error Sending Testing Webhook. Error: {str(e)}"))
+ print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f | Region: {region_list[0]}] Error Sending Testing Webhook. Error: {str(e)}"))
@client.event
-async def on_message(message: discord.Interaction):
+async def on_message(message: discord.Message):
if message.channel.id == 1100043271503351858:
- await message.add_reaction("<โ
>")
-
+ try:
+ await message.add_reaction("โ
")
+ except:
+ pass
else:
pass
-client.run(data['bot_token'])
\ No newline at end of file
+client.run(data['bot_token'])
From 1c113b2ba7cf51eb149f9e9353cd8ed14d6cc36e Mon Sep 17 00:00:00 2001
From: Je_mi_to_burt <72654834+jemitoburt@users.noreply.github.com>
Date: Fri, 28 Apr 2023 19:44:28 +0200
Subject: [PATCH 3/4] Update Main.py
---
Main.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Main.py b/Main.py
index 8159084..a10a07a 100644
--- a/Main.py
+++ b/Main.py
@@ -78,7 +78,7 @@ def get_raffle_details(product_data, region_data):
webhook = DiscordWebhook(url = webhook_url)
embed = DiscordEmbed(title = f'{str(product_name)}', url = f'https://www.soleretriever.com/raffles/{str(product_data[0])}/raffle/{str(product_data[1])}', color = int(embed_color), description=f'> New Raffle Live For {str(region_emoji[region_data]["name"])} :{str(region_emoji[region_data]["flag"])}:')
embed.set_thumbnail(url = product_image)
- embed.set_footer(text = f'SoleRetriever Monitor by {embed_footer_text} \U000000B7 {datetime.datetime.now()}')
+ embed.set_footer(text = f'SoleRetriever Monitor by {embed_footer_text} \U000000B7 {datetime.datetime.now()}', icon_url = "https://i.imgur.com/rdWuZBR.png")
embed.add_embed_field(name = 'Product SKU: ', value = f'`{product_sku}`')
if raffle_type == 'In app':
@@ -150,7 +150,7 @@ async def webhook_test(ctx: discord.ApplicationContext):
async def on_message(message: discord.Message):
if message.channel.id == 1100043271503351858:
try:
- await message.add_reaction("โ
")
+ await message.add_reaction("\U00002705")
except:
pass
else:
From 37922395c887a8697643664d6e36b4bf91f8c4fe Mon Sep 17 00:00:00 2001
From: Je_mi_to_burt <72654834+jemitoburt@users.noreply.github.com>
Date: Sat, 29 Apr 2023 08:21:12 +0200
Subject: [PATCH 4/4] Fixed test webhook and raffle webhook
---
Main.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Main.py b/Main.py
index a10a07a..2e9f8c0 100644
--- a/Main.py
+++ b/Main.py
@@ -76,9 +76,9 @@ def get_raffle_details(product_data, region_data):
raffle_store= data_json['retailer']['name']
webhook = DiscordWebhook(url = webhook_url)
- embed = DiscordEmbed(title = f'{str(product_name)}', url = f'https://www.soleretriever.com/raffles/{str(product_data[0])}/raffle/{str(product_data[1])}', color = int(embed_color), description=f'> New Raffle Live For {str(region_emoji[region_data]["name"])} :{str(region_emoji[region_data]["flag"])}:')
+ embed = DiscordEmbed(title = f'{str(product_name)}', url = f'https://www.soleretriever.com/raffles/{str(product_data[0])}/raffle/{str(product_data[1])}', color = int(embed_color), description=f'> New Raffle Live For {str(region_data["name"])} :{str(region_data["flag"])}:')
embed.set_thumbnail(url = product_image)
- embed.set_footer(text = f'SoleRetriever Monitor by {embed_footer_text} \U000000B7 {datetime.datetime.now()}', icon_url = "https://i.imgur.com/rdWuZBR.png")
+ embed.set_footer(text = f'SoleRetriever Monitor by {embed_footer_text} \U000000B7 {datetime.datetime.now()}')
embed.add_embed_field(name = 'Product SKU: ', value = f'`{product_sku}`')
if raffle_type == 'In app':
@@ -138,7 +138,7 @@ async def webhook_test(ctx: discord.ApplicationContext):
await ctx.defer(ephemeral=True)
try:
raffle = get_raffles(region_list[0])
- get_raffle_details(raffle[0], region_list[0])
+ get_raffle_details(raffle[0], region_emoji[region_list[0]])
await ctx.respond('Testing Succesful', ephemeral=True)
print(datetime.datetime.now().strftime(f"[%d %B %Y %H:%M:%S.%f | Region: {region_list[0]}] Successfully Send Testing Webhook"))