leftypol/leftypol
1
2
Fork 1
Code Issues 51 Pull requests 7 Projects Releases Packages Wiki Activity Actions

WIP: Add iphub filter #72

Draft
Zankaria wants to merge 12 commits from iphub-filter into config
pull from: iphub-filter
merge into: leftypol:config
Conversation 7 Commits 12 Files changed 3 +170
Zankaria commented 2024-10-08 13:51:43 -05:00 (Migrated from gitlab.leftypol.org)
Copy link
No description provided.
Zankaria commented 2024-10-10 15:29:19 -05:00 (Migrated from gitlab.leftypol.org)
Copy link

added 6 commits

  • 219b5e6c - config.php: add ip block on api suggestion
  • e64668b9 - functions.php: use updated config format
  • 628c95a8 - post.php: add IP API check
  • 656655a1 - functions.php: add caching to IP api checks
  • b2f475f0 - functions.php: block on API suggestion
  • 9a2f9584 - functions.php: handle bad json from iphub

Compare with previous version

added 6 commits <ul><li>219b5e6c - config.php: add ip block on api suggestion</li><li>e64668b9 - functions.php: use updated config format</li><li>628c95a8 - post.php: add IP API check</li><li>656655a1 - functions.php: add caching to IP api checks</li><li>b2f475f0 - functions.php: block on API suggestion</li><li>9a2f9584 - functions.php: handle bad json from iphub</li></ul> [Compare with previous version](/leftypol/leftypol/-/merge_requests/1/diffs?diff_id=3&start_sha=61f216c9a7e09af622d49cb8dfb9c7e730288d54)
cyberbarbarian commented 2024-10-10 15:36:26 -05:00 (Migrated from gitlab.leftypol.org)
Copy link

requested review from @cyberbarbarian

requested review from @cyberbarbarian
cyberbarbarian commented 2024-10-10 15:36:40 -05:00 (Migrated from gitlab.leftypol.org)
Copy link

approved this merge request

approved this merge request
Zankaria commented 2024-10-10 17:17:38 -05:00 (Migrated from gitlab.leftypol.org)
Copy link

added 10 commits

  • 1cc87c31 - config.php: refactor IPHub api to be a more generic IP api
  • f008f887 - functions.php: use updated config format
  • 2337f990 - functions.php: grammar
  • a422122d - post.php: add IP API check
  • 61d58d77 - functions.php: add caching to IP api checks
  • f7676d13 - config.php: add ip block on api suggestion
  • f1bbd097 - functions.php: block on API suggestion
  • 155a6eae - functions.php: handle bad json from iphub
  • 9b969821 - config.php: add add_note option to ip api
  • ad243189 - functions.php: add note on rejected ip for IP API

Compare with previous version

added 10 commits <ul><li>1cc87c31 - config.php: refactor IPHub api to be a more generic IP api</li><li>f008f887 - functions.php: use updated config format</li><li>2337f990 - functions.php: grammar</li><li>a422122d - post.php: add IP API check</li><li>61d58d77 - functions.php: add caching to IP api checks</li><li>f7676d13 - config.php: add ip block on api suggestion</li><li>f1bbd097 - functions.php: block on API suggestion</li><li>155a6eae - functions.php: handle bad json from iphub</li><li>9b969821 - config.php: add add_note option to ip api</li><li>ad243189 - functions.php: add note on rejected ip for IP API</li></ul> [Compare with previous version](/leftypol/leftypol/-/merge_requests/1/diffs?diff_id=5&start_sha=9a2f95842b26642079d5235ab62859ffd710231d)
Zankaria commented 2024-11-04 17:33:26 -06:00 (Migrated from gitlab.leftypol.org)
Copy link

This will break

This will break
cyberbarbarian (Migrated from gitlab.leftypol.org) approved these changes 2025-02-18 15:50:02 -06:00
Zankaria changed title from Add iphub filter to WIP: Add iphub filter 2025-02-28 10:41:17 -06:00
Zankaria commented 2025-11-07 15:12:00 -06:00
Owner
Copy link

This is unusable as is. Only config.php can be savaged.

This is unusable as is. Only config.php can be savaged.
This pull request has changes conflicting with the target branch.
  • inc/config.php
  • post.php
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin iphub-filter:iphub-filter
git switch iphub-filter

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch config
git merge --no-ff iphub-filter
git switch iphub-filter
git rebase config
git switch config
git merge --ff-only iphub-filter
git switch iphub-filter
git rebase config
git switch config
git merge --no-ff iphub-filter
git switch config
git merge --squash iphub-filter
git switch config
git merge --ff-only iphub-filter
git switch config
git merge iphub-filter
git push origin config
Sign in to join this conversation.
Reviewers
No reviewers
cyberbarbarian
Labels
Clear labels   
Bug
Something isn't working as it should

  
Proposal
An improvement that isn't really required but would be nice to have

  
Request
A change or addition requested by staff

No labels
Bug
Proposal
Request
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
leftypol/leftypol!72
No description provided.