Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] contributor-branch/pokurt-pr-1 from master #1

Open
wants to merge 89 commits into
base: contributor-branch/pokurt-pr-1
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Sep 27, 2021

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

pokurt and others added 30 commits August 11, 2020 04:05
yeah they are a bit retarded ngl
Updates on the 'nana' directory should run the Docker image build and push (only on master).
Changes:
- Anime will return photo instead of link preview
- Reveal: reveal self destruct photos untouched
The Cirrus Labs Support said that we need to specify an instance for the publish task.
Since we're just using Git to push stuff to Herokuwu, they recommend using the Alpine Linux with Git.
[pull] master from pokurt:master

Signed-off-by: Andrei Jiroh Eugenio Halili <[email protected]>
This reverts commit 5a2f2a7.
removed uuid() since pyrogram automatically assign it in id= parameter
deprecated non async eval method, using stsout and stderr now, Inspired by Colin's pyrobot  (spechide fork)

Co-Authored-By: Shrimadhav U K <[email protected]>
Signed-off-by: Andrei Jiroh Eugenio Halili <[email protected]>
Signed-off-by: Andrei Jiroh Eugenio Halili <[email protected]>
* Updated

- Using New Pyrogram v1.0.4
- Added @intellivoid Official SpamProtection API lookup for both user and Inline
- OCR
- and um,,, Easter Egg uwu

Issues:
- Sticker Filter broken (dev needed)

* added sticker list to /stats

* starup up var function

Co-Authored-By: Rizki Firmansyah <[email protected]>

* cleanup and disabled kang for now

* Final Changes

- Disabled the use of kang temporarily till I find a solution
- Fixed Start and Stopping userbot from use with Assistant (/settings option)
- Final Commit to Merge to Master

Note: If you want sticker kang back you can still get it back by changing repository to Nana via repo changer (not Nana-Remix), thats the only solution I can find for now

Co-authored-by: Rizki Firmansyah <[email protected]>, Mendel <[email protected]>
ダンクデル // 千鶴 and others added 28 commits November 19, 2020 15:16
* Cleaned up

- new config load
- startup fixed
- Multiple Command Prefixes are allowed now
- stats with 0 notes will have no issues anymore

* Removed Assistant Session

- no need. we can just use the token to create a session in pyrogram

* Git errors

- Alive message wont throw any errors any more, rip git

* tracemoe issue fixed

it should throw the gif now.

* DeepSauce Fixes

- Removed Un-Imported Modules
- Some Refractors
i dont change this text:

<b>Send Messages:</b> {}\n<b>Send Media:</b> {}\n<b>Send Stickers:</b> {}\n<b>Send Animations:</b> {}\n<b>Can Play Games:</b> {}\n<b>Can Use Inline Bots:</b> {}\n<b>Webpage Preview:</b> {}\n<b>Send Polls:</b> {}\n<b>Change Info:</b> {}\n<b>Invite Users:</b> {}\n<b>Pin Messages:</b> {}\n"


because i dont know if i need to translate this or not
- hebrew, thanks to @iiiiii1wepfj
- Indonasian, thanks to @breakdowns
- minor changes
- removed bitly token (useless)
- added `ASSISTANT_BOT_TOKEN` to app.json
* Update he.yml (MadeByThePinsHub#63)

* Added Speedtest Translation

- 2 strings are changed which includes The Trigger and the Running string

* Update he.yml (MadeByThePinsHub#64)

* New translations en-US.yml (English) (MadeByThePinsHub#65)

* removed crowdin

* renamed function

function already exist

* persian translation by matt (MadeByThePinsHub#72)

Thanks matt and itay

* Added Farsi

- Added persian language to Userbot

* Update fa.yml (MadeByThePinsHub#73)

* Updated Speedtest strings

- updated `speed_test_trigger` and `speed_test_running`

Co-authored-by: iiiiii1wepfj <[email protected]>
Co-authored-by: Hafitz Setya <[email protected]>
- added translators credits to README.md
* new strings
* new Languages

- updated strings for all existing languages

Co-Authored-By: iiiiii1wepfj <[email protected]>
Co-Authored-By: Hafitz Setya <[email protected]>
Co-authored-by: spkal01 <[email protected]>
Co-authored-by: iiiiii1wepfj <[email protected]>
Co-authored-by: Hafitz Setya <[email protected]>
Co-authored-by: Matt <[email protected]>
Co-authored-by: NachABR <[email protected]>
Co-authored-by: iiiiii1wepfj <[email protected]>
Co-authored-by: Lucky <[email protected]>
* refractored

for new update uwu

* translator fixed

- moved to Davide's mod
- removed unused modules and refractored

* bumped up pyrogram version

* source changed

- source of ytdl is changed
* fixed clone

* updated strings

- updated string for lanugage button
- removed usage

* new language

- added German uwu

* fixed admincheck

* finalizing

* nuking heroku api

* added branches

* fixed updater

* nuked heroku support

- we using zeet baby

removed names from language buttons

* visual error

- fixed markdown on speedtest

* finalize

- removed heroku dependencies completely

* removed unused modules
- allowed users to use without assistant without NANA_IMG
* switchable branches

* added GitCommandError

for a better Error Handling

* nuked file ref

* nuked config.py

using config.ini
* Translations (MadeByThePinsHub#83)

- asyncio create task was broken due to uvloop
* Migration to pyrogram 1.1.6

- refractored
- migrated to pyrogram 1.1.6
- renamed helpers with utils
- added a new config variable to fix bot spamming in pm, fill in `REPOSITORY` link to stop this from happening

* refractored using flake8

* following flake8
* Huge change with structure to the userbot

- finalizing 3.2

* changed languages

- users can create group calls

* Added Kurdish Language

Co-authored-by: Roj <[email protected]>
- New Directory Structure to Easy Understand How Userbot works
- Create GroupCall will cgroupcall
- Refractored Code in flake8 style
- an understandable info command (now works even though user never put SpamWatch API key)
- Updated to Pyrogram v1.1.7
- Fixed Quotly Forward Messages
- Moved Lanuguage Button inside /settings
- Added Kurdish Language
- Async IBM WATSON

Note for those who hosted on zeet or any Saas Deployment service might need a redeploy or wait 12 hours after updating the Userbot. Enjoy!
- Added RextesterAPI
- Inline Message Edits has been fixed throughout different groups with different dc_ids (
- Makefile was created for easily running and testing the userbot.
- `reportadmins` fixed
- [WIP] - Pillow Quotes added (just an experiment)
- Pyrogram Version 1.1.8

**Note:**
With this update `Dev` branch is deprecated! all the other branches will be intact.
* Miss some modules (MadeByThePinsHub#106)

* Pyrogram 1.1.9

- Updated base lib to 1.1.9

Co-authored-by: Fallah Andy Prakasa <[email protected]>
- fixed help menu of rextester py
- updated pyrogram v1.1.11
- removed the use of raw bot api calls (no need since we got it fixed on pyrogram side)
- strNana.py will detect config.ini and get the API_ID and API_HASH automatically
- tracemoepy not working on python3.8.5 is fixed
- added turkish language
- removed `.log` from user side and added /logs into assistant bot

Co-authored-by: Fallah Andy Prakasa <[email protected]>
Co-authored-by: SelaxG <[email protected]>
fixed version restriction
…-Remix

Finally, we're done fixing those merge conflicts ever again.
Also it should stop Dependabot from yeeting us every time for
dependency updates again.

Signed-off-by: Andrei Jiroh Halili <[email protected]>
Okay, I want rest.

Signed-off-by: Andrei Jiroh Eugenio Halili <[email protected]>
Signed-off-by: Andrei Jiroh Eugenio Halili <[email protected]>
Signed-off-by: Andrei Jiroh Eugenio Halili <[email protected]>
@pull pull bot added merge-conflict Resolve conflicts manually ⤵️ pull labels Sep 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants