新建话题
diff --git a/app/services/admins/memos/show.html.erb b/app/services/admins/memos/show.html.erb
index 2cb6d732..84a0fb67 100644
--- a/app/services/admins/memos/show.html.erb
+++ b/app/services/admins/memos/show.html.erb
@@ -5,7 +5,7 @@
<%= format_date( @memo.created_at)%>
diff --git a/app/services/forum_sections_service.rb b/app/services/forum_sections_service.rb
index 5146593c..a8bb4a7d 100644
--- a/app/services/forum_sections_service.rb
+++ b/app/services/forum_sections_service.rb
@@ -103,7 +103,7 @@ class ForumSectionsService
user_item = {
id: u.id,
login: u.try(:login),
- username: u.try(:show_name),
+ username: u.try(:show_real_name),
nickname: u.try(:nickname)
}
search_users.push(user_item)
@@ -133,7 +133,7 @@ class ForumSectionsService
user_list = {
forum_moderator_id: new_forum_moder.id,
login: user.try(:login),
- username: user.try(:show_name),
+ username: user.try(:show_real_name),
user_url: "/users/#{user.try(:login)}"
}
forum_users.push(user_list)
@@ -230,7 +230,7 @@ class ForumSectionsService
end
apply_user = {
apply_id: apply.id,
- username: user.try(:show_name),
+ username: user.try(:show_real_name),
login: user.try(:login),
image_url: "#{url_to_avatar(user)}?#{Time.now.to_i}",
user_url: "/users/#{user.try(:login)}",
@@ -335,8 +335,9 @@ class ForumSectionsService
extra = "2"
else
parent_section_id = ""
- admin_role_ids= AdminRole.includes(:admin_permissions).joins(:admin_permissions).where("admin_permissions.name = 'forum_post'").pluck(:id)
- manager_ids = UserAdminRole.where(admin_role_id: admin_role_ids).pluck(:user_id).uniq
+ manager_ids = User.select(:admin, :id).admin_users.pluck(:id)
+ # admin_role_ids= AdminRole.includes(:admin_permissions).joins(:admin_permissions).where("admin_permissions.name = 'forum_post'").pluck(:id)
+ # manager_ids = UserAdminRole.where(admin_role_id: admin_role_ids).pluck(:user_id).uniq
extra = "1"
end
if manager_ids.size == 0
@@ -394,7 +395,7 @@ class ForumSectionsService
memo_id: memo.id,
is_banned: is_banned,
memo_title: memo.subject,
- username: user.try(:show_name),
+ username: user.try(:show_real_name),
login: user.try(:login),
image_url: "#{url_to_avatar(user)}?#{Time.now.to_i}",
user_url: "/users/#{user.try(:login)}",
@@ -441,7 +442,7 @@ class ForumSectionsService
is_banned: is_banned,
reply_id: memo.id,
reply_content: memo.content,
- username: user.try(:show_name),
+ username: user.try(:show_real_name),
login: user.try(:login),
image_url: "#{url_to_avatar(user)}?#{Time.now.to_i}",
user_url: "/users/#{user.try(:login)}",
@@ -504,7 +505,7 @@ class ForumSectionsService
memo_id: memo.id,
is_banned: is_banned,
memo_title: memo.subject,
- username: user.try(:show_name),
+ username: user.try(:show_real_name),
login: user.try(:login),
image_url: "#{url_to_avatar(user)}?#{Time.now.to_i}",
user_url: "/users/#{user.try(:login)}",
diff --git a/app/services/memos_service.rb b/app/services/memos_service.rb
index eafd38ba..59322237 100644
--- a/app/services/memos_service.rb
+++ b/app/services/memos_service.rb
@@ -12,7 +12,7 @@ class MemosService
search = params[:search].to_s.strip
sort_name = params[:sort] || "published_at"
- all_memos = Memo&.visible&.roots&.includes(:forum_section,author: :user_extensions)
+ all_memos = Memo&.visible&.roots
all_hottest_memos = all_memos.hottest_five_memos
hottest_memos = object_to_hash(all_hottest_memos)
@@ -25,7 +25,7 @@ class MemosService
end
memos_count = all_memos.size # 帖子的总数
- all_memos = all_memos.order_index(sort_name).limit(index_limit).offset(offset)
+ all_memos = all_memos.order_index(sort_name)&.includes(:forum_section,author: :user_extension).limit(index_limit).offset(offset)
memo_lists = get_memo_lists(all_memos, false, current_user, false)
@@ -34,10 +34,10 @@ class MemosService
end
- def related_memos params
+ def related_memos params, current_user
memo = Memo.find(params[:id])
return { status: 404 } if memo.hidden? && (!current_user || !(current_user.admin? || current_user.id == memo.author_id))
- all_memos = Memo.visible.roots.where("id != ?", params[:id].to_i).includes(memo_forums: :forum_section,author: :user_extensions).related_search_name(memo.try(:subject).to_s).order_index("published_at").limit(5).offset(0)
+ all_memos = Memo.visible.roots.where("id != ?", params[:id].to_i).includes(memo_forums: :forum_section,author: :user_extension).related_search_name(memo.try(:subject).to_s).order_index("published_at").limit(5).offset(0)
memo_lists = get_memo_lists(all_memos, false, current_user, false)
{status: 0, memos: memo_lists}
end
@@ -81,7 +81,7 @@ class MemosService
# memo.published_at = Time.now if params[:memo][:published_at].blank?
memo.hidden = true
# memo.save!
- if memo.save
+ if memo.save!
memo.update_attachments(params[:attachments]) if params[:attachments].present?
# 为了区分帖子头像，改变其类型为MemoIcon
create_user_tidings(memo, "forum_post")
@@ -95,8 +95,7 @@ class MemosService
{status: -1, message: memo.errors.messages.values[0][0]}
end
rescue => e
- {status: -1, message: "出现错误"}
- raise ActiveRecord::Rollback
+ {status: -1, message: e}
end
end
@@ -147,7 +146,7 @@ class MemosService
is_md = memo.is_md
- author_info = {username: memo_author.show_name,
+ author_info = {username: memo_author.show_real_name,
watched: watched,
is_blocked: current_user&.blocked_for(memo_author.id),
is_blocked_by: memo_author&.blocked_for(current_user.id),
@@ -156,10 +155,10 @@ class MemosService
identity: memo_author.identity,
login: memo_author.login,
user_id: memo_author.id,
- description: memo_author&.user_extensions&.brief_introduction,
+ description: memo_author&.user_extension&.brief_introduction,
memos_count: memo_author_memos.posts.size,
replies_count: memo_author_memos.total_replies.size,
- watchers_count: memo_author.watcher_users.size,
+ watchers_count: memo_author.fan_count,
current_login: current_user.try(:login),
is_current_user: memo.author_id == current_user.try(:id)
}
@@ -189,20 +188,21 @@ class MemosService
}
if current_user
- unless memo.children.blank?
- memo.children.includes(:memo_messages).each do |child|
- child.memo_messages.each do |memo_message|
- memo_message.update_attributes(:viewed => true) if current_user.id == memo_message.user_id
- end
- end
- end
+ #TODO 通知消息暂时隐藏
+ # unless memo.children.blank?
+ # memo.children.includes(:memo_messages).each do |child|
+ # child.memo_messages.each do |memo_message|
+ # memo_message.update_attributes(:viewed => true) if current_user.id == memo_message.user_id
+ # end
+ # end
+ # end
- query_memo_messages = memo.memo_messages
- unless query_memo_messages
- query_memo_messages.each do |query_memo_message|
- query_memo_message.update_attributes(:viewed => true) if current_user.id == query_memo_message.user_id
- end
- end
+ # query_memo_messages = memo.memo_messages
+ # unless query_memo_messages
+ # query_memo_messages.each do |query_memo_message|
+ # query_memo_message.update_attributes(:viewed => true) if current_user.id == query_memo_message.user_id
+ # end
+ # end
if memo.author_id != current_user.id
if memo.visit_actions.exists?(watcher_params)
@@ -268,7 +268,7 @@ class MemosService
def destroy params, current_user
user_permission = check_banned_permission current_user, params[:id]
- memo = Memo.select([:id,:parent_id]).find(params[:id])
+ memo = Memo.select(:id,:parent_id, :forum_section_id).find(params[:id])
return {status: -1, message: "帖子不存在！"} unless memo.present?
return {status: -1, message: "您没有权限操作！"} unless user_permission
if memo.destroy
@@ -412,7 +412,7 @@ class MemosService
memo.children << reply
create_user_tidings(reply, "forum_comment")
replies = {:id => reply.id, :content => reply.content, :time => time_from_now(reply.created_at), :user_id => reply.author_id,
- :image_url => "/images/#{url_to_avatar(reply.author)}?#{Time.now.to_i}", :username => reply.author.show_name, :reward => memo.reward, :hidden => reply.hidden,
+ :image_url => "/images/#{url_to_avatar(reply.author)}?#{Time.now.to_i}", :username => reply.author.show_real_name, :reward => memo.reward, :hidden => reply.hidden,
:praise_count => reply.praises_count,:user_login => reply.author.try(:login), replies_count: reply.can_see_reply_count(current_user)}
{
status: 0,
@@ -483,6 +483,30 @@ class MemosService
end
+ def plus params, current_user
+ plus_type = params[:container_type].to_s
+ plus_id = params[:id]
+
+ pt = PraiseTread.where(:praise_tread_object_id => params[:id], :praise_tread_object_type => params[:container_type],
+ :user_id => current_user, :praise_or_tread => 1).first
+ # 如果当前用户已赞过，则不能重复赞
+ if params[:type] == 1 && pt.blank?
+ if pt.blank?
+ PraiseTread.create!(:praise_tread_object_id => plus_id, :praise_tread_object_type => plus_type,
+ :user_id => current_user.id, :praise_or_tread => 1) if pt.blank?
+
+ plus_name = plus_type.constantize.find(params[:id])
+ Tiding.create(:user_id => plus_name.try(:author_id), :trigger_user_id => current_user.id,
+ container_id: plus_id, container_type: plus_type,
+ :parent_container_id => plus_id, :parent_container_type => plus_type,
+ :viewed => 0, :tiding_type => "PraiseTread")
+ end
+ else
+ pt.destroy if pt.present? # 如果已赞过，则删掉这条赞（取消）；如果没赞过，则为非法请求不处理
+ end
+ {:praise_count => PraiseTread.where(:praise_tread_object_id => params[:id], :praise_tread_object_type => params[:container_type],
+ :praise_or_tread => 1).count}
+ end
def banned_user params, current_user
user_permission = check_banned_permission current_user, params[:id]
@@ -533,14 +557,14 @@ class MemosService
forum_section = ForumSection.find_by_id(params[:id])
return {status: -1, message: "版块不存在"} if forum_section.blank?
section_author = forum_section.user
- forum_section_user = {username: section_author.try(:show_name), user_login: section_author.try(:login)}
+ forum_section_user = {username: section_author.try(:show_real_name), user_login: section_author.try(:login)}
forum_moders = []
if ForumModerator.exists?(forum_section_id: forum_section.id)
- all_forum_moderators = forum_section.forum_moderators.includes(user: :user_extensions).select([:id, :user_id])
+ all_forum_moderators = forum_section.forum_moderators.includes(user: :user_extension).select([:id, :user_id])
all_forum_moderators.each do |moder|
moder_user = moder.user
forum_moder = {
- username: moder_user.show_name,
+ username: moder_user.show_real_name,
user_login: moder_user.try(:login)
}
forum_moders << forum_moder
@@ -616,13 +640,13 @@ class MemosService
active_user_array = []
active_users.each do |user|
active_user_array.push({
- username: user.show_name,
+ username: user.show_real_name,
login: user.login,
image_url: "#{url_to_avatar(user)}?#{Time.now.to_i}"
})
end
{
- username: forum_section.user.show_name,
+ username: forum_section.user.show_real_name,
user_login: forum_section.user.login,
notice: notice.try(:content),
recommend_forum_sections: new_childre_section,
@@ -685,7 +709,7 @@ class MemosService
memo_list = []
memos.each do |m|
forum_name = m.forums.map(&:name)
- user_info = {username: m.author.show_name, login: m.author.login, image_url: "#{url_to_avatar(m.author)}?#{Time.now.to_i}", forum_name:forum_name, praise_count: m.praises_count}
+ user_info = {username: m.author.show_real_name, login: m.author.login, image_url: "#{url_to_avatar(m.author)}?#{Time.now.to_i}", forum_name:forum_name, praise_count: m.praises_count}
memo_list << m.attributes.dup.merge(user_info)
end
memo_list
@@ -702,7 +726,7 @@ class MemosService
end
end
-
+
def check_banned_permission current_user, memo_id
forum_id = MemoForum&.where(is_children: false, memo_id: memo_id)&.first.try(:forum_id).to_s
user_banned_permission current_user, forum_id
@@ -731,7 +755,7 @@ class MemosService
permission = current_user ? current_user.manager_of_memo?(memo) : false
# 实训（TPM）的管理员可以看到隐藏的评论
replies = {:id => memo.id, :content => memo.content, :time => time_from_now(memo.created_at), :user_id => memo.author_id,
- :image_url => "/images/#{url_to_avatar(memo.author)}?#{Time.now.to_i}", :username => memo.author.show_name, :reward => memo.reward, :hidden => memo.hidden,
+ :image_url => "/images/#{url_to_avatar(memo.author)}?#{Time.now.to_i}", :username => memo.author.show_real_name, :reward => memo.reward, :hidden => memo.hidden,
:permission => permission, :praise_count => memo.praises_count, :user_praise => user_praise,
:user_login => memo.author.try(:login), :admin => current_user&.admin, is_banned: is_banned, replies_count: memo.can_see_reply_count(current_user)}
childrens = Memo.where(:parent_id => memo.id).includes(:author).reorder("created_at desc").limit(5)
@@ -743,7 +767,7 @@ class MemosService
children_praise = child.praise_tread.exists?(user_id: current_user.try(:id).to_i)
children_is_banned = user_is_banned?(child.author) #帖子的用户是否被禁言
children_list << {:id => child.id, :content => child.content, :time => time_from_now(child.created_at),:praise_count => memo.praises_count, :user_praise => children_praise,
- :image_url => "/images/#{url_to_avatar(child.author)}?#{Time.now.to_i}", :username => child.author.show_name, :hidden => child.hidden, replies_count: child.can_see_reply_count(current_user),
+ :image_url => "/images/#{url_to_avatar(child.author)}?#{Time.now.to_i}", :username => child.author.show_real_name, :hidden => child.hidden, replies_count: child.can_see_reply_count(current_user),
:permission => permission, :user_login => child.author.try(:login), :user_id => child.author.try(:id), :parent_id => child.parent_id, is_banned: children_is_banned}
end
list << replies.merge({children: children_list})
diff --git a/app/services/my_memos_service.rb b/app/services/my_memos_service.rb
index fcdb68b1..9a98fd32 100644
--- a/app/services/my_memos_service.rb
+++ b/app/services/my_memos_service.rb
@@ -61,7 +61,7 @@ class MyMemosService
def recommend_memos current_user
return {status: -1, message: "请登录"} unless current_user
- all_memos = Memo.includes(memo_forums: :forum_section,author: :user_extensions)
+ all_memos = Memo.includes(memo_forums: :forum_section,author: :user_extension)
all_hottest_memos = all_memos.visible.hottest_five_memos
hottest_memos = object_to_hash(all_hottest_memos)
diff --git a/app/services/projects/apply_join_service.rb b/app/services/projects/apply_join_service.rb
index 0b57712d..2383b0ca 100644
--- a/app/services/projects/apply_join_service.rb
+++ b/app/services/projects/apply_join_service.rb
@@ -66,7 +66,7 @@ class Projects::ApplyJoinService < ApplicationService
return if owner.phone.blank?
Educoder::Sms.send(mobile: owner.phone, send_type:'applied_project_info',
- user_name: owner.show_name, name: project.name)
+ user_name: owner.show_real_name, name: project.name)
rescue Exception => ex
Rails.logger.error("发送短信失败 => #{ex.message}")
end
diff --git a/app/views/admins/memos/_memo_reply_list.html.erb b/app/views/admins/memos/_memo_reply_list.html.erb
index 15cd94c5..0f74ca9d 100644
--- a/app/views/admins/memos/_memo_reply_list.html.erb
+++ b/app/views/admins/memos/_memo_reply_list.html.erb
@@ -38,7 +38,7 @@
=end%>
- <%= link_to(memo.try(:author).try(:show_name), user_path(memo.author)) %>
+ <%= link_to(memo.try(:author).try(:show_real_name), user_path(memo.author)) %>
<%# if memo.try(:author).try(:realname) == ' '%>
<%#= link_to(memo.try(:author), user_path(memo.author)) %>
<%# else %>
diff --git a/app/views/admins/memos/_message_list.html.erb b/app/views/admins/memos/_message_list.html.erb
index d0b74ad9..c7c49009 100644
--- a/app/views/admins/memos/_message_list.html.erb
+++ b/app/views/admins/memos/_message_list.html.erb
@@ -27,7 +27,7 @@
|
| <%= (@obj_pages.page - 1) * @obj_pages.per_page + index + 1 %> |
- <%= link_to(memo.try(:author).try(:show_name), user_path(memo.author)) %>
+ <%= link_to(memo.try(:author).try(:show_real_name), user_path(memo.author)) %>
|
<% if memo.parent_id.nil? || memo.subject.starts_with?('RE:')%>
diff --git a/config/application.rb b/config/application.rb
index 9aaa900b..fece76eb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,12 +43,5 @@ module Educoderplus
resource '/*', :headers => :any, :methods => [:get, :post, :delete, :options, :put]
end
end
- config.middleware.use Rack::Cors do
- allow do
- origins '*'
- # location of your API
- resource '/api/*', :headers => :any, :methods => [:get, :post, :delete, :options, :put]
- end
- end
end
end
diff --git a/config/initializers/autoreload_grape.rb b/config/initializers/autoreload_grape.rb
deleted file mode 100644
index 5cbfa509..00000000
--- a/config/initializers/autoreload_grape.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# if Rails.env.development?
-# lib_ruby_files = Dir.glob(File.join("app/api/**", "*.rb"))
-# lib_reloader ||= ActiveSupport::FileUpdateChecker.new(lib_ruby_files) do
-# # lib_ruby_files.each do |lib_file|
-# # puts "start require #{lib_file}"
-# # require_dependency(lib_file)
-# # end
-# #
-
-# # binding.pry
-# # if Object.const_defined?(:Mobile)
-# # Object.send(:remove_const, :Mobile)
-# # end
-# #
-# # $".delete_if {|s| s.include?('api/mobile') }
-# # require File.join(Rails.root,"app/api/mobile/api.rb")
-# Rails.application.reload_routes!
-# end
-
-# ActionDispatch::Callbacks.to_prepare do
-# lib_reloader.execute_if_updated
-# end
-
-# end
-
-
diff --git a/config/routes.rb b/config/routes.rb
index fe62b0a8..48666388 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@ Rails.application.routes.draw do
require 'sidekiq/web'
require 'admin_constraint'
- mount Mobile::API => '/api'
+ # mount Mobile::API => '/api'
# mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new
# Serve websocket cable requests in-process
@@ -45,6 +45,51 @@ Rails.application.routes.draw do
resources :edu_settings
scope '/api' do
+ get 'my_memos/:login/memos', to: 'my_memos#index'
+ get 'my_memos/:login/my_interested', to: 'my_memos#my_interested'
+ get 'my_memos/:login/replies_memos', to: 'my_memos#replies_memos'
+ get 'my_memos/:login/recommend_memos', to: 'my_memos#recommend_memos'
+ get 'forum_sections/:id/deal_applies/:apply_id', to: 'forum_sections#deal_applies'
+ get 'forum_sections/:id/destroy_moderator/:moderator_id', to: 'forum_sections#destroy_moderator'
+ resources :forum_sections, only: [:index, :create, :destroy] do
+ collection do
+ get :select_sections
+ end
+ member do
+ post :user_apply
+ post :edit_notice
+ get :forum_section_header
+ post :rename
+ get :order_forums
+ get :search_users
+ post :add_users
+ get :managements
+ get :applied_forums
+ get :unchecked_memos
+ get :unchecked_replies
+ get :checked_memos
+ end
+ end
+ get 'memos/forum_memos/:id', to: 'memos#forum_memos'
+ get 'memos/forum_memos_head/:id', to: 'memos#forum_memos_head'
+ get 'memos/forum_memos_right/:id', to: 'memos#forum_memos_right'
+ post 'forum_memos/:id/is_watch', to: 'memos#is_watch'
+ resources :memos, only: [:index, :create, :edit, :update, :show, :destroy] do
+ member do
+ get :related_memos
+ post :watch_memo
+ get :hidden
+ post :watch_memo
+ post :memo_hidden
+ post :reply
+ get :set_top_or_down
+ post :is_fine
+ post :banned_user
+ get :more_reply
+ post :confirm_delete
+ post :plus
+ end
+ end
resources :sync_forge, only: [:create] do
collection do
post :sync_users
diff --git a/db/migrate/20201013023832_change_memo_null_true.rb b/db/migrate/20201013023832_change_memo_null_true.rb
new file mode 100644
index 00000000..a27d6490
--- /dev/null
+++ b/db/migrate/20201013023832_change_memo_null_true.rb
@@ -0,0 +1,5 @@
+class ChangeMemoNullTrue < ActiveRecord::Migration[5.2]
+ def change
+ change_column_null(:memos, :forum_id, true)
+ end
+end
diff --git a/db/migrate/20201013030153_add_memo_image_to_attachment.rb b/db/migrate/20201013030153_add_memo_image_to_attachment.rb
new file mode 100644
index 00000000..bd19ef2f
--- /dev/null
+++ b/db/migrate/20201013030153_add_memo_image_to_attachment.rb
@@ -0,0 +1,6 @@
+class AddMemoImageToAttachment < ActiveRecord::Migration[5.2]
+ def change
+ add_column :attachments, :memo_image, :boolean, default: false
+ add_column :attachments, :extra_type, :integer, default: 0
+ end
+end
diff --git a/db/migrate/20201013032846_create_block_users.rb b/db/migrate/20201013032846_create_block_users.rb
new file mode 100644
index 00000000..cd187efd
--- /dev/null
+++ b/db/migrate/20201013032846_create_block_users.rb
@@ -0,0 +1,11 @@
+class CreateBlockUsers < ActiveRecord::Migration[5.2]
+ def change
+ create_table :block_users do |t|
+ t.integer "user_id"
+ t.integer "block_user_id"
+ t.timestamps
+ end
+ add_index :block_users, :user_id
+ add_index :block_users, :block_user_id
+ end
+end
diff --git a/db/migrate/20201013035058_create_memo_messages.rb b/db/migrate/20201013035058_create_memo_messages.rb
new file mode 100644
index 00000000..38668f5d
--- /dev/null
+++ b/db/migrate/20201013035058_create_memo_messages.rb
@@ -0,0 +1,12 @@
+class CreateMemoMessages < ActiveRecord::Migration[5.2]
+ def change
+ create_table :memo_messages do |t|
+ t.integer "user_id"
+ t.integer "forum_id"
+ t.integer "memo_id"
+ t.string "memo_type"
+ t.integer "viewed"
+ t.timestamps
+ end
+ end
+end
diff --git a/spec/models/block_user_spec.rb b/spec/models/block_user_spec.rb
new file mode 100644
index 00000000..de136f6f
--- /dev/null
+++ b/spec/models/block_user_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe BlockUser, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/memo_message_spec.rb b/spec/models/memo_message_spec.rb
new file mode 100644
index 00000000..af4831c9
--- /dev/null
+++ b/spec/models/memo_message_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe MemoMessage, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
|