Fix previous/next page buttons

README.md

@@ -65,8 +65,58 @@ Stack Overflow: `https://i.stack.imgur.com/KnO3v.jpg?s=64&g=1` -> `https://rimgo
 To automatically redirect Imgur links, see [Redirection](https://rimgo.codeberg.page/docs/usage/redirection/).
 
 ## Instances
+Open an issue to have your instance listed here! See the rules for the instance list [here](https://rimgo.codeberg.page/docs/usage/instance-list-rules/).
 
-Available at https://rimgo.codeberg.page/ or https://codeberg.org/rimgo/instances
+> For more details on instance privacy, see https://rimgo.codeberg.page/docs/usage/instance-privacy/
+
+### Clearnet
+
+| URL                                                        	  | Country      | Provider                 | Privacy               | Notes |
+| :------------------------------------------------------------ | :----------- | :----------------------- | :-------------------- | :---- |
+| [rimgo.pussthecat.org](https://rimgo.pussthecat.org)       	  | 🇩🇪 DE        | Hetzner                  | ⚠️ Data collected     |       |
+| [rimgo.totaldarkness.net](https://rimgo.totaldarkness.net) 	  | 🇨🇦 CA        | Vultr                    | ✅ Data not collected |       |
+| [rimgo.bus-hit.me](https://rimgo.bus-hit.me)               	  | 🇨🇦 CA        | Oracle                   | ⚠️ Data collected |       |
+| [imgur.artemislena.eu](https://imgur.artemislena.eu)       	  | 🇩🇪 DE        | Vodafone Deutschland     | ✅ Data not collected | Self-hosted, provider is ISP |
+| [rimgo.vern.cc](https://rimgo.vern.cc)                        | 🇺🇸 US        | OVHCloud                 | ✅ Data not collected | [Edited theme](https://git.vern.cc/root/modifications/src/branch/master/rimgo) |
+| [rim.odyssey346.dev](https://rim.odyssey346.dev/)             | 🇫🇷️ FR        | Trolling Solutions (OVH) | ✅ Data not collected |       |
+| [i.habedieeh.re](https://i.habedieeh.re/)                     | 🇨🇦️ CA        | Oracle Cloud             | ✅ Data not collected |       |
+| [rimgo.hostux.net](https://rimgo.hostux.net/)	                | 🇫🇷️ FR        | Gandi	                   | ⚠️ Data collected     |       |
+| [ri.zzls.xyz](https://ri.zzls.xyz/)                           | 🇨🇱 CL        | TELEFÓNICA CHILE         | ✅ Data not collected | Self-hosted, provider is ISP |
+| [rimgo.lunar.icu](https://rimgo.marcopisco.com/)              | 🇩🇪 DE        | Cloudflare               | ✅ Data not collected |       |
+| [imgur.010032.xyz](https://imgur.010032.xyz/)                 | 🇰🇷 KR        | Oracle Cloud             | ✅ Data not collected |       |
+| [rimgo.kling.gg](https://rimgo.kling.gg/)                     | 🇳🇱 NL        | RamNode                  | ✅ Data not collected |       |
+| [i.01r.xyz](https://i.01r.xyz/)                               | 🇺🇸 US        | Cloudflare               | ✅ Data not collected |       |
+| [rimgo.projectsegfau.lt](https://rimgo.projectsegfau.lt/)     | 🇫🇷 FR, 🇺🇸 US, 🇮🇳 IN | See below         | ✅ Data not collected |       |
+| [rimgo.eu.projectsegfau.lt](https://rimgo.eu.projectsegfau.lt/)  | 🇫🇷 FR | Orange S.A.              | ✅ Data not collected |       |
+| [rimgo.us.projectsegfau.lt](https://rimgo.us.projectsegfau.lt/)  | 🇺🇸 US | Racknerd                    | ✅ Data not collected |       |
+| [rimgo.in.projectsegfau.lt](https://rimgo.in.projectsegfau.lt/)  | 🇮🇳 IN | Airtel                          | ✅ Data not collected |       |
+| [rimgo.whateveritworks.org](https://rimgo.whateveritworks.org/)           | 🇩🇪 DE | Cloudflare                      | ✅ Data not collected |       |
+| [rimgo.nohost.network](https://rimgo.nohost.network/)         | 🇲🇽 MX | Telmex                          | ✅ Data not collected |       |
+| [rimgo.catsarch.com](https://rimgo.catsarch.com/)             | 🇺🇸 US | Comcast                         | ✅ Data not collected | Self-hosted, provider is ISP |
+| [rimgo.frontendfriendly.xyz](https://rimgo.frontendfriendly.xyz/) | 🇩🇪 DE   | Hetzner                   | ⚠️ Data collected     |       |
+
+### Tor
+
+| URL | Privacy | Notes                    |
+| :-- | :------ | :----------------------- |
+| [rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion](http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion) | ✅ Data not collected | Onion of rimgo.vern.cc         |
+| [imgur.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion](http://imgur.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion) | ✅ Data not collected | Onion of imgur.artemislena.eu  |
+| [rim.odysfvr23q5wgt7i456o5t3trw2cw5dgn56vbjfbq2m7xsc5vqbqpcyd.onion](http://rim.odysfvr23q5wgt7i456o5t3trw2cw5dgn56vbjfbq2m7xsc5vqbqpcyd.onion)     | ⚠️ Data collected |  |
+| [tdp6uqjtmok723suum5ms3jbquht6d7dssug4cgcxhfniatb25gcipad.onion](http://tdp6uqjtmok723suum5ms3jbquht6d7dssug4cgcxhfniatb25gcipad.onion)             | ✅ Data not collected | Onion of rimgo.privacytools.io |
+| [i.habeehrhadazsw3izbrbilqajalfyqqln54mrja3iwpqxgcuxnus7eid.onion](http://i.habeehrhadazsw3izbrbilqajalfyqqln54mrja3iwpqxgcuxnus7eid.onion/)        | ✅ Data not collected | Onion of i.habedieeh.re |
+| [rimgo.zzlsghu6mvvwyy75mvga6gaf4znbp3erk5xwfzedb4gg6qqh2j6rlvid.onion](http://rimgo.zzlsghu6mvvwyy75mvga6gaf4znbp3erk5xwfzedb4gg6qqh2j6rlvid.onion/) | ✅ Data not collected | Onion of ri.zzls.xyz |
+| [tdn7zoxctmsopey77mp4eg2gazaudyhgbuyytf4zpk5u7lknlxlgbnid.onion/](http://tdn7zoxctmsopey77mp4eg2gazaudyhgbuyytf4zpk5u7lknlxlgbnid.onion/) | ✅ Data not collected | Onion of rimgo.kling.gg |
+| [rimgo.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion](http://rimgo.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion/) | ✅ Data not collected | Onion of rimgo.eu.projectsegfau.lt |
+
+### I2P
+
+| URL | Privacy | Notes                    |
+| :-- | :------ | :----------------------- |
+| [rimgo.i2p](http://rimgo.i2p) | ✅ Data not collected | i.habedieeh.re on I2P |
+| [rimgov7l2tqyrm5txrtvhtnfyrzkc5d7ipafofavchbnnyog4r3q.b32.i2p](http://rimgov7l2tqyrm5txrtvhtnfyrzkc5d7ipafofavchbnnyog4r3q.b32.i2p) | ✅ Data not collected | Same as rimgo.i2p |
+| [rimgo.zzls.i2p](http://rimgo.zzls.i2p) | ✅ Data not collected | ri.zzls.xyz on I2P |
+| [p57356k2xwhxrg2lxrjajcftkrptv4zejeeblzfgkcvpzuetkz2a.b32.i2p](http://p57356k2xwhxrg2lxrjajcftkrptv4zejeeblzfgkcvpzuetkz2a.b32.i2p) | ✅ Data not collected | Same as rimgo.zzls.i2p |
+| [ovzamsts5czfx3jasbbhbccyyl2z7qmdngtlqxdh4oi7abhdz3ia.b32.i2p](http://ovzamsts5czfx3jasbbhbccyyl2z7qmdngtlqxdh4oi7abhdz3ia.b32.i2p) | ✅ Data not collected | rimgo.kling.gg on I2P |
 
 ## Install
 
@@ -77,10 +127,7 @@ See [Install](https://rimgo.codeberg.page/docs/getting-started/install/).
 See [Configuration](https://rimgo.codeberg.page/docs/usage/configuration/).
 
 ## Contributing
-Pull requests are welcome! If you have any questions or bug reports, open an [issue](https://codeberg.org/rimgo/rimgo/issues/new). Please remember to follow our [Code of Conduct](https://rimgo.codeberg.page/docs/code-of-conduct/)!
+Pull requests are welcome! If you have any questions or bug reports, open an [issue](https://codeberg.org/rimgo/rimgo/issues/new).
 
 ## License
 This software is released under the AGPL-3.0 license. If you make any modifications to the code and distribute it (including use on a network server), you must publicly distribute your changes and release them under the AGPL-3.0.
-
-## Legal notice
-rimgo does not allow uploads or host any content, media. All content on any rimgo instances is from Imgur™. Imgur is a trademark of Imgur, Inc. Any issues with content on rimgo should be be reported to Imgur.

instances.json

@@ -152,12 +152,5 @@
       "de"
     ],
     "cloudflare": false
-  },
-  {
-    "url": "https://rimgo.quantenzitrone.eu",
-    "countries": [
-      "cz"
-    ],
-    "cloudflare": false
   }
 ]

pages/search.go

@@ -29,6 +29,11 @@ func HandleSearch(c *fiber.Ctx) error {
 		pageNumber = 0
 	}
 
+	displayPrevPage := true
+	if page == "0" {
+		displayPrevPage = false
+	}
+
 	results, err := ApiClient.Search(query, page)
 	if err != nil {
 		return err
@@ -37,7 +42,8 @@ func HandleSearch(c *fiber.Ctx) error {
 	return c.Render("search", fiber.Map{
 		"query":			 query,
 		"results":     results,
-		"page":        pageNumber,
+		"page":        pageNumber + 1,
+		"displayPrev": displayPrevPage,
 		"nextPage":    pageNumber + 1,
 		"prevPage":    pageNumber - 1,
 	})

pages/tag.go

@@ -23,6 +23,11 @@ func HandleTag(c *fiber.Ctx) error {
 		pageNumber = 0
 	}
 
+	displayPrevPage := true
+	if page == "1" {
+		displayPrevPage = false
+	}
+
 	tag, err := ApiClient.FetchTag(c.Params("tag"), c.Query("sort"), page)
 	if err != nil && err.Error() == "ratelimited by imgur" {
 		return c.Status(429).Render("errors/429", fiber.Map{
@@ -39,6 +44,7 @@ func HandleTag(c *fiber.Ctx) error {
 	return c.Render("tag", fiber.Map{
 		"tag":         tag,
 		"page":        page,
+		"displayPrev": displayPrevPage,
 		"nextPage":    pageNumber + 1,
 		"prevPage":    pageNumber - 1,
 	})

pages/trending.go

@@ -36,6 +36,11 @@ func HandleTrending(c *fiber.Ctx) error {
 		sort = "popular"
 	}
 
+	displayPrevPage := true
+	if page == "1" {
+		displayPrevPage = false
+	}
+
 	results, err := ApiClient.FetchTrending(section, sort, page)
 	if err != nil {
 		return err
@@ -46,6 +51,7 @@ func HandleTrending(c *fiber.Ctx) error {
 		"section":     section,
 		"sort":        sort,
 		"page":        pageNumber,
+		"displayPrev": displayPrevPage,
 		"nextPage":    pageNumber + 1,
 		"prevPage":    pageNumber - 1,
 	})

views/frontpage.hbs

@@ -25,8 +25,8 @@
       rimgo is not affiliated with Imgur, all content is proxied from Imgur.
     </p>
     <br/>
-    <h3 class="font-bold text-xl">Legal notice</h3>
-    <p>rimgo does not allow uploads or host any content, media. All content on any rimgo instances is from Imgur™. Imgur is a trademark of Imgur, Inc. Any issues with content on rimgo should be be reported to Imgur.</p>
+    <h3 class="font-bold text-xl">Notice</h3>
+    <p>All images and media are from Imgur. rimgo does not allow uploads or comments. Any issues with content should be reported to Imgur.</p>
   </main>
   
   <h2 class="font-bold text-2xl">This instance</h2>

views/post.hbs

@@ -52,7 +52,7 @@
       </div>
     </div>
 
-    <div class="flex flex-center flex-col break-words">
+    <div class="flex flex-center flex-col">
       {{#each post.Media}}
       {{#if this.Title}}
       <h4 class="font-bold">{{this.Title}}</h4>

views/search.hbs

@@ -22,10 +22,10 @@
     </div>
 
     <div class="flex justify-between mt-4 font-bold">
-      {{#noteq page "0"}}
+      {{#if displayPrev}}
       <a href="/search?q={{query}}&page={{prevPage}}">Previous page</a>
-      {{/noteq}}
-      <p>Page {{nextPage}}</p>
+      {{/if}}
+      <p>Page {{page}}</p>
       <a href="/search?q={{query}}&page={{nextPage}}">Next page</a>
     </div>
   </main>

views/tag.hbs

@@ -45,11 +45,10 @@
       {{/each}}
     </div>
 
-    <div class="flex justify-between mt-4 font-bold">
-      {{#noteq page "1"}}
+    <div class="mt-4 font-bold">
+      {{#if displayPrev}}
       <a href="{{channel.RelUrl}}?page={{prevPage}}">Previous page</a>
-      {{/noteq}}
-      <p>Page {{nextPage}}</p>
+      {{/if}}
       <a href="{{channel.RelUrl}}?page={{nextPage}}">Next page</a>
     </div>
   </main>

views/trending.hbs

@@ -65,9 +65,9 @@
     </div>
 
     <div class="flex justify-between mt-4 font-bold">
-      {{#noteq page "1"}}
+      {{#if displayPrev}}
       <a href="/trending?section={{section}}&sort={{sort}}&page={{prevPage}}">Previous page</a>
-      {{/noteq}}
+      {{/if}}
       <p>Page {{page}}</p>
       <a href="/trending?section={{section}}&sort={{sort}}&page={{nextPage}}">Next page</a>
     </div>