random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates to fixes for deploy

Browse Source 
• Updates:
- to fixes for deploy
This commit is contained in:
mgabdev 2020-11-09 16:19:04 -06:00
parent 351929b148
commit 1ef59c2266
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/popular_links_controller.rb
View File

@ -43,7 +43,7 @@ class Api::V1::PopularLinksController < Api::BaseController
cards = PreviewCard.joins("LEFT JOIN preview_cards_statuses ON preview_cards.id = preview_cards_statuses.preview_card_id") cards = PreviewCard.joins("LEFT JOIN preview_cards_statuses ON preview_cards.id = preview_cards_statuses.preview_card_id")
.where('preview_cards_statuses.preview_card_id IS NOT NULL') .where('preview_cards_statuses.preview_card_id IS NOT NULL')
.where('preview_cards_statuses.status_id IN (?)', statusIds) .where('preview_cards_statuses.status_id IN (?)', statusIds)
.having('COUNT(preview_cards_statuses.preview_card_id) > 2') .having('COUNT(preview_cards_statuses.preview_card_id) > 1')
.where('preview_cards.updated_at > ?', 24.hours.ago) .where('preview_cards.updated_at > ?', 24.hours.ago)
.order('COUNT(preview_cards_statuses.preview_card_id) DESC') .order('COUNT(preview_cards_statuses.preview_card_id) DESC')
.group('preview_cards.id') .group('preview_cards.id')

2
app/javascript/gabsocial/actions/news.js
View File

@ -64,7 +64,7 @@ export const expandGabTrendsFeed = (feedId) => (dispatch, getState) => {
dispatch(expandGabTrendsFeedRequest(feedId)) dispatch(expandGabTrendsFeedRequest(feedId))
const url = `http://trends.gab.com/feed/${feedId}?fmt=json&p=${page}` const url = `https://trends.gab.com/feed/${feedId}?fmt=json&p=${page}`
// api(getState).get(`/api/v1/gab_trends?type=rss&page=${page}&feedId=${feedId}`).then((response) => { // api(getState).get(`/api/v1/gab_trends?type=rss&page=${page}&feedId=${feedId}`).then((response) => {
axios.get(url).then((response) => { axios.get(url).then((response) => {
dispatch(expandGabTrendsFeedSuccess(response.data.rssFeedItems, feedId, response.data.pagination.p)) dispatch(expandGabTrendsFeedSuccess(response.data.rssFeedItems, feedId, response.data.pagination.p))

4
config/initializers/content_security_policy.rb
View File

@ -20,10 +20,10 @@ Rails.application.config.content_security_policy do |p|
if Rails.env.development? if Rails.env.development?
webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" } webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" }
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls, "https://*.gab.com", "https://api.tenor.com" p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls, "https://*.gab.com"
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host, "https://*.gab.com" p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host, "https://*.gab.com"
else else
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, "https://*.gab.com", "https://api.tenor.com" p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, "https://*.gab.com"
p.script_src :self, assets_host, "https://*.gab.com" p.script_src :self, assets_host, "https://*.gab.com"
end end
end end