X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d0092199871708580301c38d375dc3f7dda9285a..ce52ba1e6ae4e5ae5fb03e64bde9c7df1dcae4ff:/app/controllers/diary_entries_controller.rb

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index a8fc41808..f3752cb2c 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
@@ -69,9 +71,11 @@ class DiaryEntriesController < ApplicationController
     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
       @opengraph_properties = {
+        "og:title" => @entry.title,
         "og:image" => @entry.body.image,
         "og:image:alt" => @entry.body.image_alt,
-        "og:description" => @entry.body.description
+        "og:description" => @entry.body.description,
+        "article:published_time" => @entry.created_at.xmlschema
       }
       @comments = can?(:unhide, DiaryComment) ? @entry.comments : @entry.visible_comments
     else
@@ -119,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
@@ -215,7 +219,7 @@ class DiaryEntriesController < ApplicationController
   ##
   # return permitted diary entry parameters
   def entry_params
-    params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)
+    params.expect(:diary_entry => [:title, :body, :language_code, :latitude, :longitude])
   rescue ActionController::ParameterMissing
     ActionController::Parameters.new.permit(:title, :body, :language_code, :latitude, :longitude)
   end