refactor: Cleaning double closing script, deprecated thumbnail script

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Aug 7, 2022 · edde7f6 · edde7f6
1 parent 5bded81
commit edde7f6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 119 deletions.
diff --git a/cmd/fibr/static/scripts/thumbnail.js b/cmd/fibr/static/scripts/thumbnail.js
diff --git a/cmd/fibr/templates/async-image.html b/cmd/fibr/templates/async-image.html
@@ -82,7 +82,7 @@
      * Async image loading
      */
     async function fetchThumbnail() {
-      fetchURL = document.location.search;
+      let fetchURL = document.location.search;
       if (fetchURL.includes('?')) {
         fetchURL += '&thumbnail';
       } else {
@@ -154,6 +154,4 @@
       false,
     );
   </script>
-
-  </script>
 {{ end }}
diff --git a/pkg/provider/event.go b/pkg/provider/event.go
@@ -128,6 +128,15 @@ func (e Event) GetURL() string {
 	return e.URL
 }
 
+func (e Event) BrowserURL() string {
+	return e.GetURL() + "?browser"
+}
+
+func (e Event) StoryURL(id string) string {
+	url := e.GetURL()
+	return fmt.Sprintf("%s/?d=story#%s", url[:strings.LastIndex(url, "/")], id)
+}
+
 // GetName returns the name of the item
 func (e Event) GetName() string {
 	if e.New != nil {

diff --git a/pkg/webhook/event.go b/pkg/webhook/event.go
@@ -83,26 +83,25 @@ func (a *App) discordHandle(ctx context.Context, webhook provider.Webhook, event
 		return send(ctx, webhook.ID, request.Post(webhook.URL), discord.NewDataResponse(a.eventText(event)))
 	}
 
-	url := event.GetURL()
 	title := path.Base(path.Dir(event.Item.Pathname))
 	if title == "/" {
 		title = "fibr"
 	}
 
-	var description string
+	var url, description string
 	fields := []discord.Field{discord.NewField("item", event.GetName())}
 
 	switch event.Type {
 	case provider.UploadEvent:
 		description = "💾 A file has been uploaded"
-		url += "?browser"
+		url = event.BrowserURL()
 	case provider.RenameEvent:
 		description = "✏️ An item has been renamed"
 		fields = append(fields, discord.NewField("to", event.GetTo()))
-		url += "?browser"
+		url = event.BrowserURL()
 	case provider.DescriptionEvent:
 		description = "💬 " + event.Metadata["description"]
-		url = fmt.Sprintf("%s/?d=story#%s", url[:strings.LastIndex(url, "/")], event.Item.ID)
+		url = event.StoryURL(event.Item.ID)
 	}
 
 	embed := discord.Embed{
@@ -135,26 +134,25 @@ func (a *App) slackHandle(ctx context.Context, webhook provider.Webhook, event p
 		return send(ctx, webhook.ID, request.Post(webhook.URL), slack.NewResponse(a.eventText(event)))
 	}
 
-	url := event.GetURL()
 	title := path.Base(path.Dir(event.Item.Pathname))
 	if title == "/" {
 		title = "fibr"
 	}
 
-	var description string
+	var url, description string
 	var extraField slack.Text
 
 	switch event.Type {
 	case provider.UploadEvent:
 		description = "💾 A file has been uploaded"
-		url += "?browser"
+		url = event.BrowserURL()
 	case provider.RenameEvent:
 		description = "✏️ An item has been renamed"
 		extraField = slack.NewText(fmt.Sprintf("*to*\n%s", event.GetTo()))
-		url += "?browser"
+		url = event.BrowserURL()
 	case provider.DescriptionEvent:
 		description = "💬 " + event.Metadata["description"]
-		url = fmt.Sprintf("%s/?d=story#%s", url[:strings.LastIndex(url, "/")], event.Item.ID)
+		url = event.StoryURL(event.Item.ID)
 	}
 
 	section := slack.NewSection(slack.NewText(description)).AddField(slack.NewText(fmt.Sprintf("*item*\n%s", event.GetName())))