X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0f50292784a4353e883ddc3771e52b8d4b8a4133..3f62d67684261b724a5a536be0260ce44654c828:/app/controllers/diary_entries_controller.rb

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 9962c7efd..94876e72a 100644
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -28,8 +28,8 @@ class DiaryEntriesController < ApplicationController
       end
     elsif params[:friends]
       if current_user
-        @title = t ".title_friends"
-        entries = DiaryEntry.where(:user => current_user.friends)
+        @title = t ".title_followed"
+        entries = DiaryEntry.where(:user => current_user.followings)
       else
         require_user
         return
@@ -60,6 +60,8 @@ class DiaryEntriesController < ApplicationController
     @params = params.permit(:display_name, :friends, :nearby, :language)
 
     @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language])
+
+    render :partial => "page" if turbo_frame_request_id == "pagination"
   end
 
   def show
@@ -68,8 +70,13 @@ class DiaryEntriesController < ApplicationController
     @entry = entries.find_by(:id => params[:id])
     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
-      @og_image = @entry.body.image
-      @og_image_alt = @entry.body.image_alt
+      @opengraph_properties = {
+        "og:title" => @entry.title,
+        "og:image" => @entry.body.image,
+        "og:image:alt" => @entry.body.image_alt,
+        "og:description" => @entry.body.description,
+        "article:published_time" => @entry.created_at.xmlschema
+      }
       @comments = can?(:unhide, DiaryComment) ? @entry.comments : @entry.visible_comments
     else
       @title = t "diary_entries.no_such_entry.title", :id => params[:id]
@@ -116,7 +123,7 @@ class DiaryEntriesController < ApplicationController
       # Subscribe user to diary comments
       @diary_entry.subscriptions.create(:user => current_user)
 
-      redirect_to :action => "index", :display_name => current_user.display_name
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
     else
       render :action => "new"
     end