use 'me' instead of 'user' consistently
This commit is contained in:
@ -23,6 +23,7 @@ app:get("thread_create", "/create", function(self)
|
||||
end
|
||||
self.all_topics = all_topics
|
||||
self.page_title = "creating thread"
|
||||
self.me = user
|
||||
return {render = "threads.create"}
|
||||
end)
|
||||
|
||||
@ -90,7 +91,7 @@ app:get("thread", "/:slug", function(self)
|
||||
LIMIT ? OFFSET ?
|
||||
]], thread.id, POSTS_PER_PAGE, (self.page - 1) * POSTS_PER_PAGE)
|
||||
self.topic = Topics:find(thread.topic_id)
|
||||
self.user = util.get_logged_in_user_or_transient(self)
|
||||
self.me = util.get_logged_in_user_or_transient(self)
|
||||
self.posts = posts
|
||||
|
||||
self.page_title = thread.title
|
||||
|
@ -21,7 +21,7 @@ local ThreadCreateError = {
|
||||
|
||||
app:get("all_topics", "", function(self)
|
||||
self.topic_list = db.query("select * from topics limit 25;")
|
||||
self.user = util.get_logged_in_user(self) or util.TransientUser
|
||||
self.me = util.get_logged_in_user_or_transient(self)
|
||||
return {render = "topics.topics"}
|
||||
end)
|
||||
|
||||
@ -32,6 +32,7 @@ app:get("topic_create", "/create", function(self)
|
||||
end
|
||||
|
||||
self.page_title = "creating topic"
|
||||
self.me = user
|
||||
|
||||
return {render = "topics.create"}
|
||||
end)
|
||||
@ -67,7 +68,7 @@ app:get("topic", "/:slug", function(self)
|
||||
self.threads_list = db.query("SELECT * FROM threads WHERE topic_id = ? ORDER BY is_stickied DESC, created_at DESC", topic.id)
|
||||
local user = util.get_logged_in_user_or_transient(self)
|
||||
print(topic.is_locked, type(topic.is_locked))
|
||||
self.user = user
|
||||
self.me = user
|
||||
self.ThreadCreateError = ThreadCreateError
|
||||
self.thread_create_error = ThreadCreateError.OK
|
||||
if user:is_logged_in_guest() then
|
||||
@ -95,7 +96,7 @@ app:get("topic_edit", "/:slug/edit", function(self)
|
||||
return {redirect_to = self:url_for("all_topics")}
|
||||
end
|
||||
self.topic = topic
|
||||
|
||||
self.me = user
|
||||
self.page_title = "editing topic " .. topic.name
|
||||
|
||||
return {render = "topics.edit"}
|
||||
|
@ -131,8 +131,7 @@ app:get("user_delete_confirm", "/:username/delete_confirm", function(self)
|
||||
self.err = self.session.flash.error
|
||||
self.session.flash = {}
|
||||
end
|
||||
self.user = target_user
|
||||
|
||||
self.me = target_user
|
||||
self.page_title = "confirm deletion"
|
||||
|
||||
return {render = "user.delete_confirm"}
|
||||
@ -212,8 +211,7 @@ app:get("user_settings", "/:username/settings", function(self)
|
||||
self.flash_msg = flash.error
|
||||
end
|
||||
end
|
||||
self.user = target_user
|
||||
|
||||
self.me = target_user
|
||||
self.page_title = "settings"
|
||||
|
||||
return {render = "user.settings"}
|
||||
@ -440,4 +438,4 @@ app:post("guest_user", "/guest_user/:user_id", function(self)
|
||||
return {redirect_to = self:url_for("user", {username = target_user.username})}
|
||||
end)
|
||||
|
||||
return app
|
||||
return app
|
||||
|
Reference in New Issue
Block a user