refactor(ipfs): change ipfs url to pinata

#1945
elimu-ai · Nov 12, 2024 · 9891b13 · 9891b13
1 parent 8ff4f9c
commit 9891b13
Show file tree

Hide file tree

Showing 14 changed files with 300 additions and 300 deletions.
diff --git a/src/main/java/ai/elimu/model/content/multimedia/Image.java b/src/main/java/ai/elimu/model/content/multimedia/Image.java
@@ -38,7 +38,7 @@ public class Image extends Multimedia {
 
     public String getUrl() {
         if (cid != null) {
-            return "https://ipfs.io/ipfs/" + cid;
+            return "https://black-historic-wren-832.mypinata.cloud/ipfs/" + cid;
         } else {
             return "/image/" + getId() + "_r" + getRevisionNumber() + "." + imageFormat.toString().toLowerCase();
         }

diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java
@@ -149,8 +149,8 @@ public String handleSubmit(
             imageContributionEventDao.create(imageContributionEvent);
 
             if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-                String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/multimedia/image/edit/" + image.getId();
-                String embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + image.getId() + "_r" + image.getRevisionNumber() + "." + image.getImageFormat().toString().toLowerCase();
+                String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/multimedia/image/edit/" + image.getId();
+                String embedThumbnailUrl = image.getUrl();
                 DiscordHelper.sendChannelMessage(
                         "Image created: " + contentUrl, 
                         "\"" + image.getTitle() + "\"",

diff --git a/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
@@ -61,10 +61,10 @@ public String handleSubmit(
         storyBookPeerReviewEventDao.create(storyBookPeerReviewEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-            String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBookContributionEvent.getStoryBook().getId();
+            String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBookContributionEvent.getStoryBook().getId();
             String embedThumbnailUrl = null;
             if (storyBookContributionEvent.getStoryBook().getCoverImage() != null) {
-                embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBookContributionEvent.getStoryBook().getCoverImage().getId() + "_r" + storyBookContributionEvent.getStoryBook().getCoverImage().getRevisionNumber() + "." + storyBookContributionEvent.getStoryBook().getCoverImage().getImageFormat().toString().toLowerCase();
+                embedThumbnailUrl = storyBookContributionEvent.getStoryBook().getCoverImage().getUrl();
             }
             DiscordHelper.sendChannelMessage(
                     "Storybook peer-reviewed: " + contentUrl, 

diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java
@@ -102,10 +102,10 @@ public String handleSubmit(
             storyBookContributionEventDao.create(storyBookContributionEvent);
 
             if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-                String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+                String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
                 String embedThumbnailUrl = null;
                 if (storyBook.getCoverImage() != null) {
-                    embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                    embedThumbnailUrl = storyBook.getCoverImage().getUrl();
                 }
                 DiscordHelper.sendChannelMessage(
                         "Storybook created: " + contentUrl,

diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java
@@ -421,10 +421,10 @@ public String handleSubmit(
             storyBookDao.update(storyBook);
 
             if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-                String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+                String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
                 String embedThumbnailUrl = null;
                 if (storyBook.getCoverImage() != null) {
-                    embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                    embedThumbnailUrl = storyBook.getCoverImage().getUrl();
                 }
                 DiscordHelper.sendChannelMessage(
                         "Storybook created (imported from ePUB): " + contentUrl,
@@ -522,8 +522,8 @@ private void storeImageContributionEvent(Image image, HttpSession session, HttpS
         imageContributionEventDao.create(imageContributionEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-            String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/multimedia/image/edit/" + image.getId();
-            String embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + image.getId() + "_r" + image.getRevisionNumber() + "." + image.getImageFormat().toString().toLowerCase();
+            String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/multimedia/image/edit/" + image.getId();
+            String embedThumbnailUrl = image.getUrl();
             DiscordHelper.sendChannelMessage(
                     "Image created: " + contentUrl,
                     "\"" + image.getTitle() + "\"",

diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java
@@ -222,10 +222,10 @@ public String handleSubmit(
             storyBookContributionEventDao.create(storyBookContributionEvent);
 
             if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-                String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+                String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
                 String embedThumbnailUrl = null;
                 if (storyBook.getCoverImage() != null) {
-                    embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                    embedThumbnailUrl = storyBook.getCoverImage().getUrl();
                 }
                 DiscordHelper.sendChannelMessage("Storybook edited: " + contentUrl,
                         "\"" + storyBookContributionEvent.getStoryBook().getTitle() + "\"",

diff --git a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java
@@ -107,10 +107,10 @@ public String handleSubmit(
             storyBookContributionEventDao.create(storyBookContributionEvent);
 
             if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-                String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+                String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
                 String embedThumbnailUrl = null;
                 if (storyBook.getCoverImage() != null) {
-                    embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                    embedThumbnailUrl = storyBook.getCoverImage().getUrl();
                 }
                 DiscordHelper.sendChannelMessage(
                         "Storybook chapter created: " + contentUrl,

diff --git a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java
@@ -135,10 +135,10 @@ public String handleRequest(HttpSession session, @PathVariable Long storyBookId,
         storyBookContributionEventDao.create(storyBookContributionEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-            String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+            String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
             String embedThumbnailUrl = null;
             if (storyBook.getCoverImage() != null) {
-                embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                embedThumbnailUrl = storyBook.getCoverImage().getUrl();
             }
             DiscordHelper.sendChannelMessage(
                     "Storybook chapter deleted: " + contentUrl,

diff --git a/...ain/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java b/...ain/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java
@@ -112,10 +112,10 @@ public String handleSubmit(
             storyBookContributionEventDao.create(storyBookContributionEvent);
 
             if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-                String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+                String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
                 String embedThumbnailUrl = null;
                 if (storyBook.getCoverImage() != null) {
-                    embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                    embedThumbnailUrl = storyBook.getCoverImage().getUrl();
                 }
                 DiscordHelper.sendChannelMessage(
                         "Storybook paragraph created: " + contentUrl,

diff --git a/...ain/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java b/...ain/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java
@@ -93,10 +93,10 @@ public String handleRequest(HttpSession session, @PathVariable Long id) {
         storyBookContributionEventDao.create(storyBookContributionEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-            String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+            String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
             String embedThumbnailUrl = null;
             if (storyBook.getCoverImage() != null) {
-                embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                embedThumbnailUrl = storyBook.getCoverImage().getUrl();
             }
             DiscordHelper.sendChannelMessage(
                     "Storybook paragraph deleted: " + contentUrl,

diff --git a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java
@@ -102,10 +102,10 @@ public String handleSubmit(
             storyBookContributionEventDao.create(storyBookContributionEvent);
 
             if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
-                String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
+                String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/storybook/edit/" + storyBook.getId();
                 String embedThumbnailUrl = null;
                 if (storyBook.getCoverImage() != null) {
-                    embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + storyBook.getCoverImage().getId() + "_r" + storyBook.getCoverImage().getRevisionNumber() + "." + storyBook.getCoverImage().getImageFormat().toString().toLowerCase();
+                    embedThumbnailUrl = storyBook.getCoverImage().getUrl();
                 }
                 DiscordHelper.sendChannelMessage(
                         "Storybook paragraph edited: " + contentUrl,