-
diff --git a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
index 10af52769..6fd047cc4 100644
--- a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
+++ b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
@@ -28,7 +28,7 @@
{{ post_report_q }}
- +
diff --git a/app/assets/templates/feedback_tpl.jst.hbs b/app/assets/templates/feedback_tpl.jst.hbs
index cf824d367..b373b2a7e 100644
--- a/app/assets/templates/feedback_tpl.jst.hbs
+++ b/app/assets/templates/feedback_tpl.jst.hbs
@@ -13,29 +13,17 @@
–
-
-{{#if preview}}
- {{t "stream.like"}}
-{{else}}
-
- {{~#if userLike~}}
- {{~t "stream.unlike"~}}
- {{~else~}}
- {{~t "stream.like"~}}
- {{~/if~}}
-
-{{/if}}
+
+ {{~#if userLike~}}
+ {{~t "stream.unlike"~}}
+ {{~else~}}
+ {{~t "stream.like"~}}
+ {{~/if~}}
+
·
-{{#if preview}}
- {{t "stream.reshare"}}
- ·
-{{else if userCanReshare}}
+{{#if userCanReshare}}
{{t "stream.reshare"}}
·
{{/if}}
-{{#if preview}}
- {{t "stream.comment"}}
-{{else}}
- {{t "stream.comment"}}
-{{/if}}
+{{t "stream.comment"}}
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index ee9eb0fb7..9c3270e5b 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -10,46 +10,24 @@
- {{ podname }}
+ {{ podname }}
+
-
-
{{/if}}
@@ -25,6 +31,12 @@
{{{personImage this "small" "micro"}}}
{{/linkToAuthor}}
{{/each}}
+ {{#if showMoreLikes}}
+
+
+ 
+
-
-
+ {{t "show_all"}}
+ {{/if}}
{{/if}}
diff --git a/app/assets/templates/stream-element_tpl.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs
index bfba508f7..ed6b8083c 100644
--- a/app/assets/templates/stream-element_tpl.jst.hbs
+++ b/app/assets/templates/stream-element_tpl.jst.hbs
@@ -1,25 +1,26 @@
- {{#with author}}
-
- {{{personImage this}}}
-
- {{/with}}
+
+ {{#unless preview}}
+ {{#with author}}
+
+ {{{personImage this}}}
+
+ {{/with}}
+ {{/unless}}
diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb
index 8e22795ef..24f08cdf0 100644
--- a/app/controllers/admin/admin_controller.rb
+++ b/app/controllers/admin/admin_controller.rb
@@ -1,8 +1,6 @@
module Admin
class AdminController < ApplicationController
-
- before_filter :authenticate_user!
- before_filter :redirect_unless_admin
-
+ before_action :authenticate_user!
+ before_action :redirect_unless_admin
end
end
diff --git a/app/controllers/api/openid_connect/authorizations_controller.rb b/app/controllers/api/openid_connect/authorizations_controller.rb
index cc2e6a0a6..94f268010 100644
--- a/app/controllers/api/openid_connect/authorizations_controller.rb
+++ b/app/controllers/api/openid_connect/authorizations_controller.rb
@@ -205,7 +205,7 @@ module Api
if prompt && prompt.include?("none")
handle_prompt_none
elsif prompt && prompt.include?("login")
- new_params = params.except("controller", "action").merge(prompt: prompt.remove("login"))
+ new_params = params.except("controller", "action").permit!.to_h.merge(prompt: prompt.remove("login"))
reauthenticate(new_params)
else
authenticate_user!
diff --git a/app/controllers/api/openid_connect/discovery_controller.rb b/app/controllers/api/openid_connect/discovery_controller.rb
index 19c9001b4..f648e3566 100644
--- a/app/controllers/api/openid_connect/discovery_controller.rb
+++ b/app/controllers/api/openid_connect/discovery_controller.rb
@@ -24,17 +24,6 @@
module Api
module OpenidConnect
class DiscoveryController < ApplicationController
- def webfinger
- jrd = {
- links: [{
- rel: OpenIDConnect::Discovery::Provider::Issuer::REL_VALUE,
- href: root_url
- }]
- }
- jrd[:subject] = params[:resource] if params[:resource].present?
- render json: jrd, content_type: "application/jrd+json"
- end
-
def configuration
render json: OpenIDConnect::Discovery::Provider::Config::Response.new(
issuer: root_url,
diff --git a/app/controllers/api/openid_connect/token_endpoint_controller.rb b/app/controllers/api/openid_connect/token_endpoint_controller.rb
index c8fd53c2d..378f0086b 100644
--- a/app/controllers/api/openid_connect/token_endpoint_controller.rb
+++ b/app/controllers/api/openid_connect/token_endpoint_controller.rb
@@ -8,7 +8,8 @@ module Api
if req["client_assertion_type"] == "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"
handle_jwt_bearer(req)
end
- self.status, response.headers, self.response_body = Api::OpenidConnect::TokenEndpoint.new.call(request.env)
+ self.status, headers, self.response_body = Api::OpenidConnect::TokenEndpoint.new.call(request.env)
+ headers.each {|name, value| response.headers[name] = value }
nil
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 50484821e..27e793c1b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,7 +5,7 @@
class ApplicationController < ActionController::Base
before_action :force_tablet_html
has_mobile_fu
- protect_from_forgery except: :receive, with: :exception
+ protect_from_forgery except: :receive, with: :exception, prepend: true
rescue_from ActionController::InvalidAuthenticityToken do
if user_signed_in?
diff --git a/app/controllers/aspect_memberships_controller.rb b/app/controllers/aspect_memberships_controller.rb
index 68215bc37..2bfd0c933 100644
--- a/app/controllers/aspect_memberships_controller.rb
+++ b/app/controllers/aspect_memberships_controller.rb
@@ -6,7 +6,7 @@
class AspectMembershipsController < ApplicationController
before_action :authenticate_user!
- respond_to :html, :json
+ respond_to :json
def destroy
aspect = current_user.aspects.joins(:aspect_memberships).where(aspect_memberships: {id: params[:id]}).first
@@ -30,18 +30,9 @@ class AspectMembershipsController < ApplicationController
if success
render json: AspectMembershipPresenter.new(membership).base_hash
else
- render text: membership.errors.full_messages, status: 403
+ render plain: membership.errors.full_messages, status: 403
end
end
-
- format.all do
- if success
- flash.now[:notice] = I18n.t "aspect_memberships.destroy.success"
- else
- flash.now[:error] = I18n.t "aspect_memberships.destroy.failure"
- end
- redirect_to :back
- end
end
end
@@ -58,35 +49,25 @@ class AspectMembershipsController < ApplicationController
AspectMembership.where(contact_id: @contact.id, aspect_id: @aspect.id).first)
.base_hash
end
-
- format.all do
- flash.now[:notice] = I18n.t("aspects.add_to_aspect.success")
- redirect_to :back
- end
end
else
respond_to do |format|
format.json do
- render text: I18n.t("aspects.add_to_aspect.failure"), status: 409
- end
-
- format.all do
- flash.now[:error] = I18n.t("aspects.add_to_aspect.failure")
- render nothing: true, status: 409
+ render plain: I18n.t("aspects.add_to_aspect.failure"), status: 409
end
end
end
end
rescue_from ActiveRecord::StatementInvalid do
- render text: I18n.t("aspect_memberships.destroy.invalid_statement"), status: 400
+ render plain: I18n.t("aspect_memberships.destroy.invalid_statement"), status: 400
end
rescue_from ActiveRecord::RecordNotFound do
- render text: I18n.t("aspect_memberships.destroy.no_membership"), status: 404
+ render plain: I18n.t("aspect_memberships.destroy.no_membership"), status: 404
end
rescue_from Diaspora::NotMine do
- render text: I18n.t("aspect_memberships.destroy.forbidden"), status: 403
+ render plain: I18n.t("aspect_memberships.destroy.forbidden"), status: 403
end
end
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index ce21bd95d..73bdf8cd2 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -22,7 +22,7 @@ class AspectsController < ApplicationController
render json: result
else
- render nothing: true, status: 422
+ head :unprocessable_entity
end
end
@@ -71,7 +71,7 @@ class AspectsController < ApplicationController
params[:ordered_aspect_ids].each_with_index do |id, i|
current_user.aspects.find(id).update_attributes(order_id: i)
end
- render nothing: true
+ head :no_content
end
def toggle_chat_privilege
@@ -79,7 +79,7 @@ class AspectsController < ApplicationController
@aspect.chat_enabled = !@aspect.chat_enabled
@aspect.save
- render :nothing => true
+ head :no_content
end
def toggle_contact_visibility
@@ -91,7 +91,7 @@ class AspectsController < ApplicationController
@aspect.contacts_visible = true
end
@aspect.save
- render :nothing => true
+ head :no_content
end
private
diff --git a/app/controllers/blocks_controller.rb b/app/controllers/blocks_controller.rb
index dd5cb4ae9..7ad4f2e1c 100644
--- a/app/controllers/blocks_controller.rb
+++ b/app/controllers/blocks_controller.rb
@@ -1,34 +1,26 @@
class BlocksController < ApplicationController
before_action :authenticate_user!
- respond_to :html, :json
-
def create
block = current_user.blocks.new(block_params)
- if block.save
- disconnect_if_contact(block.person)
- notice = {:notice => t('blocks.create.success')}
- else
- notice = {:error => t('blocks.create.failure')}
- end
+ disconnect_if_contact(block.person) if block.save
- respond_with do |format|
- format.html{ redirect_to :back, notice }
- format.json{ render :nothing => true, :status => 204 }
+ respond_to do |format|
+ format.json { head :no_content }
end
end
def destroy
- if current_user.blocks.find(params[:id]).delete
- notice = {:notice => t('blocks.destroy.success')}
- else
- notice = {:error => t('blocks.destroy.failure')}
- end
+ notice = if current_user.blocks.find_by(id: params[:id])&.delete
+ {notice: t("blocks.destroy.success")}
+ else
+ {error: t("blocks.destroy.failure")}
+ end
- respond_with do |format|
- format.html{ redirect_to :back, notice }
- format.json{ render :nothing => true, :status => 204 }
+ respond_to do |format|
+ format.json { head :no_content }
+ format.any { redirect_back fallback_location: privacy_settings_path, flash: notice }
end
end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index bde3e2fbb..f9d4ad47d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -8,21 +8,21 @@ class CommentsController < ApplicationController
respond_to :html, :mobile, :json
rescue_from ActiveRecord::RecordNotFound do
- render nothing: true, status: 404
+ head :not_found
end
def create
begin
comment = comment_service.create(params[:post_id], params[:text])
rescue ActiveRecord::RecordNotFound
- render text: I18n.t("comments.create.error"), status: 404
+ render plain: I18n.t("comments.create.error"), status: 404
return
end
if comment
respond_create_success(comment)
else
- render text: I18n.t("comments.create.error"), status: 422
+ render plain: I18n.t("comments.create.error"), status: 422
end
end
@@ -57,24 +57,24 @@ class CommentsController < ApplicationController
def respond_create_success(comment)
respond_to do |format|
format.json { render json: CommentPresenter.new(comment), status: 201 }
- format.html { render nothing: true, status: 201 }
+ format.html { head :created }
format.mobile { render partial: "comment", locals: {comment: comment} }
end
end
def respond_destroy_success
respond_to do |format|
- format.mobile { redirect_to :back }
- format.js { render nothing: true, status: 204 }
- format.json { render nothing: true, status: 204 }
+ format.mobile { redirect_back fallback_location: stream_path }
+ format.js { head :no_content }
+ format.json { head :no_content }
end
end
def respond_destroy_error
respond_to do |format|
- format.mobile { redirect_to :back }
- format.js { render nothing: true, status: 403 }
- format.json { render nothing: true, status: 403 }
+ format.mobile { redirect_back fallback_location: stream_path }
+ format.js { head :forbidden }
+ format.json { head :forbidden }
end
end
end
diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index c69b6d7d8..3f1977655 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -39,7 +39,7 @@ class ConversationsController < ApplicationController
end
unless person_ids.present?
- render text: I18n.t("javascripts.conversation.create.no_recipient"), status: 422
+ render plain: I18n.t("javascripts.conversation.create.no_recipient"), status: 422
return
end
@@ -53,7 +53,7 @@ class ConversationsController < ApplicationController
flash[:notice] = I18n.t("conversations.create.sent")
render json: {id: @conversation.id}
else
- render text: I18n.t("conversations.create.fail"), status: 422
+ render plain: I18n.t("conversations.create.fail"), status: 422
end
end
@@ -82,7 +82,7 @@ class ConversationsController < ApplicationController
@conversation.set_read(current_user)
render partial: "conversations/show", locals: {conversation: @conversation}
else
- render nothing: true, status: 404
+ head :not_found
end
end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 3c4a6b5ee..74c2b6532 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -33,7 +33,7 @@ class HomeController < ApplicationController
def toggle_mobile
session[:mobile_view] = session[:mobile_view].nil? ? true : !session[:mobile_view]
- redirect_to :back
+ redirect_back fallback_location: root_path
end
def force_mobile
diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
index 66653e83e..04927022c 100644
--- a/app/controllers/invitations_controller.rb
+++ b/app/controllers/invitations_controller.rb
@@ -42,7 +42,7 @@ class InvitationsController < ApplicationController
t("invitations.create.rejected", emails: invalid_emails.join(", "))
end
- redirect_to :back
+ redirect_back fallback_location: stream_path
end
private
@@ -55,7 +55,7 @@ class InvitationsController < ApplicationController
else
t("invitations.create.closed")
end
- redirect_to :back
+ redirect_back fallback_location: stream_path
end
def valid_email?(email)
@@ -71,6 +71,6 @@ class InvitationsController < ApplicationController
end
def inviter_params
- params.require(:email_inviter).permit(:message, :locale, :emails)
+ params.require(:email_inviter).permit(:message, :locale, :emails).to_h
end
end
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index 20fe1dd69..182760951 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -13,10 +13,10 @@ class LikesController < ApplicationController
def create
like = like_service.create(params[:post_id])
rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid
- render text: I18n.t("likes.create.error"), status: 422
+ render plain: I18n.t("likes.create.error"), status: 422
else
respond_to do |format|
- format.html { render nothing: true, status: 201 }
+ format.html { head :created }
format.mobile { redirect_to post_path(like.post_id) }
format.json { render json: like.as_api_response(:backbone), status: 201 }
end
@@ -24,9 +24,9 @@ class LikesController < ApplicationController
def destroy
if like_service.destroy(params[:id])
- render nothing: true, status: 204
+ head :no_content
else
- render text: I18n.t("likes.destroy.error"), status: 404
+ render plain: I18n.t("likes.destroy.error"), status: 404
end
end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index c5387799b..a217aab87 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -18,14 +18,6 @@ class MessagesController < ApplicationController
logger.info "event=create type=message user=#{current_user.diaspora_handle} status=success " \
"message=#{message.id} chars=#{params[:message][:text].length}"
Diaspora::Federation::Dispatcher.defer_dispatch(current_user, message)
-
- # TODO: can be removed when messages are not relayed anymore
- conversation_owner = conversation.author.owner
- if conversation_owner && conversation_owner != current_user
- remote_subs = conversation.participants.remote.ids
- opts = {subscriber_ids: remote_subs}
- Diaspora::Federation::Dispatcher.defer_dispatch(conversation_owner, message, opts) unless remote_subs.empty?
- end
else
flash[:error] = I18n.t('conversations.new_conversation.fail')
end
diff --git a/app/controllers/node_info_controller.rb b/app/controllers/node_info_controller.rb
index bb0aaa14f..aaf9b68d8 100644
--- a/app/controllers/node_info_controller.rb
+++ b/app/controllers/node_info_controller.rb
@@ -1,7 +1,4 @@
class NodeInfoController < ApplicationController
- respond_to :json
- respond_to :html, only: :statistics
-
def jrd
render json: NodeInfo.jrd(CGI.unescape(node_info_url("123.123").sub("123.123", "%{version}")))
end
@@ -17,7 +14,7 @@ class NodeInfoController < ApplicationController
def statistics
respond_to do |format|
- format.json { render json: StatisticsPresenter.new }
+ format.json { head :not_acceptable }
format.all { @statistics = NodeInfoPresenter.new("1.0") }
end
end
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index aae218b69..0d1714ea0 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -23,8 +23,8 @@ class NotificationsController < ApplicationController
def index
conditions = {:recipient_id => current_user.id}
- if params[:type] && Notification.types.has_key?(params[:type])
- conditions[:type] = Notification.types[params[:type]]
+ if params[:type] && types.has_key?(params[:type])
+ conditions[:type] = types[params[:type]]
end
if params[:show] == "unread" then conditions[:unread] = true end
page = params[:page] || 1
@@ -44,7 +44,7 @@ class NotificationsController < ApplicationController
@grouped_unread_notification_counts = {}
- Notification.types.each_with_object(current_user.unread_notifications.group_by(&:type)) {|(name, type), notifications|
+ types.each_with_object(current_user.unread_notifications.group_by(&:type)) {|(name, type), notifications|
@grouped_unread_notification_counts[name] = notifications.has_key?(type) ? notifications[type].count : 0
}
@@ -65,7 +65,7 @@ class NotificationsController < ApplicationController
end
def read_all
- current_type = Notification.types[params[:type]]
+ current_type = types[params[:type]]
notifications = Notification.where(recipient_id: current_user.id, unread: true)
notifications = notifications.where(type: current_type) if params[:type]
notifications.update_all(unread: false)
@@ -93,4 +93,17 @@ class NotificationsController < ApplicationController
}
}.as_json
end
+
+ def types
+ {
+ "also_commented" => "Notifications::AlsoCommented",
+ "comment_on_post" => "Notifications::CommentOnPost",
+ "liked" => "Notifications::Liked",
+ "mentioned" => "Notifications::MentionedInPost",
+ "mentioned_in_comment" => "Notifications::MentionedInComment",
+ "reshared" => "Notifications::Reshared",
+ "started_sharing" => "Notifications::StartedSharing"
+ }
+ end
+ helper_method :types
end
diff --git a/app/controllers/participations_controller.rb b/app/controllers/participations_controller.rb
index 95e8a2c03..1cb9b7b40 100644
--- a/app/controllers/participations_controller.rb
+++ b/app/controllers/participations_controller.rb
@@ -5,9 +5,9 @@ class ParticipationsController < ApplicationController
post = current_user.find_visible_shareable_by_id(Post, params[:post_id])
if post
current_user.participate! post
- render nothing: true, status: :created
+ head :created
else
- render nothing: true, status: :forbidden
+ head :forbidden
end
end
@@ -15,9 +15,9 @@ class ParticipationsController < ApplicationController
participation = current_user.participations.find_by target_id: params[:post_id]
if participation
participation.destroy
- render nothing: true, status: :ok
+ head :ok
else
- render nothing: true, status: :unprocessable_entity
+ head :unprocessable_entity
end
end
end
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 930ed0b7c..f42a4d908 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -19,8 +19,8 @@ class PeopleController < ApplicationController
rescue_from Diaspora::AccountClosed do
respond_to do |format|
- format.any { redirect_to :back, :notice => t("people.show.closed_account") }
- format.json { render :nothing => true, :status => 410 } # 410 GONE
+ format.any { redirect_back fallback_location: root_path, notice: t("people.show.closed_account") }
+ format.json { head :gone }
end
end
@@ -115,15 +115,15 @@ class PeopleController < ApplicationController
def retrieve_remote
if params[:diaspora_handle]
Workers::FetchWebfinger.perform_async(params[:diaspora_handle])
- render :nothing => true
+ head :ok
else
- render :nothing => true, :status => 422
+ head :unprocessable_entity
end
end
def contacts
respond_to do |format|
- format.json { render nothing: true, status: 406 }
+ format.json { head :not_acceptable }
format.any do
@person = Person.find_by_guid(params[:person_id])
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index d8b59fb4a..a95fdb420 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -66,10 +66,10 @@ class PhotosController < ApplicationController
:status => 201}
end
else
- render :nothing => true, :status => 422
+ head :unprocessable_entity
end
else
- render :nothing => true, :status => 422
+ head :unprocessable_entity
end
end
@@ -80,7 +80,7 @@ class PhotosController < ApplicationController
current_user.retract(photo)
respond_to do |format|
- format.json{ render :nothing => true, :status => 204 }
+ format.json { head :no_content }
format.html do
flash[:notice] = I18n.t 'photos.destroy.notice'
if StatusMessage.find_by_guid(photo.status_message_guid)
@@ -125,27 +125,28 @@ class PhotosController < ApplicationController
end
def legacy_create
- if params[:photo][:aspect_ids] == "all"
- params[:photo][:aspect_ids] = current_user.aspects.collect { |x| x.id }
- elsif params[:photo][:aspect_ids].is_a?(Hash)
- params[:photo][:aspect_ids] = params[:photo][:aspect_ids].values
+ photo_params = params.require(:photo).permit(:pending, :set_profile_photo, aspect_ids: [])
+ if photo_params[:aspect_ids] == "all"
+ photo_params[:aspect_ids] = current_user.aspects.map(&:id)
+ elsif photo_params[:aspect_ids].is_a?(Hash)
+ photo_params[:aspect_ids] = params[:photo][:aspect_ids].values
end
- params[:photo][:user_file] = file_handler(params)
+ photo_params[:user_file] = file_handler(params)
- @photo = current_user.build_post(:photo, params[:photo])
+ @photo = current_user.build_post(:photo, photo_params)
if @photo.save
unless @photo.pending
unless @photo.public?
- aspects = current_user.aspects_from_ids(params[:photo][:aspect_ids])
+ aspects = current_user.aspects_from_ids(photo_params[:aspect_ids])
current_user.add_to_streams(@photo, aspects)
end
- current_user.dispatch_post(@photo, :to => params[:photo][:aspect_ids])
+ current_user.dispatch_post(@photo, to: photo_params[:aspect_ids])
end
- if params[:photo][:set_profile_photo]
+ if photo_params[:set_profile_photo]
profile_params = {:image_url => @photo.url(:thumb_large),
:image_url_medium => @photo.url(:thumb_medium),
:image_url_small => @photo.url(:thumb_small)}
diff --git a/app/controllers/poll_participations_controller.rb b/app/controllers/poll_participations_controller.rb
index 2fd07c76e..a8b874fca 100644
--- a/app/controllers/poll_participations_controller.rb
+++ b/app/controllers/poll_participations_controller.rb
@@ -1,20 +1,17 @@
class PollParticipationsController < ApplicationController
- include ApplicationHelper
- before_filter :authenticate_user!
+ before_action :authenticate_user!
def create
answer = PollAnswer.find(params[:poll_answer_id])
poll_participation = current_user.participate_in_poll!(target, answer) if target
respond_to do |format|
- format.html { redirect_to :back }
format.mobile { redirect_to stream_path }
format.json { render json: poll_participation, :status => 201 }
end
rescue ActiveRecord::RecordInvalid
respond_to do |format|
- format.html { redirect_to :back }
format.mobile { redirect_to stream_path }
- format.json { render :nothing => true, :status => 403 }
+ format.json { head :forbidden }
end
end
@@ -25,4 +22,4 @@ class PollParticipationsController < ApplicationController
current_user.find_visible_shareable_by_id(Post, params[:post_id]) || raise(ActiveRecord::RecordNotFound.new)
end
end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index e88af7a77..9d6b3258c 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -3,7 +3,7 @@
# the COPYRIGHT file.
class PostsController < ApplicationController
- before_action :authenticate_user!, only: :destroy
+ before_action :authenticate_user!, only: %i(destroy mentionable)
before_action :set_format_if_malformed_from_status_net, only: :show
respond_to :html, :mobile, :json, :xml
@@ -13,7 +13,7 @@ class PostsController < ApplicationController
end
rescue_from Diaspora::NotMine do
- render text: I18n.t("posts.show.forbidden"), status: 403
+ render plain: I18n.t("posts.show.forbidden"), status: 403
end
def show
@@ -22,12 +22,11 @@ class PostsController < ApplicationController
presenter = PostPresenter.new(post, current_user)
respond_to do |format|
format.html do
- gon.post = presenter
+ gon.post = presenter.with_initial_interactions
render locals: {post: presenter}
end
format.mobile { render locals: {post: post} }
- format.xml { render xml: DiasporaFederation::Salmon::XmlPayload.pack(Diaspora::Federation::Entities.post(post)) }
- format.json { render json: presenter }
+ format.json { render json: presenter.with_interactions }
end
end
@@ -37,23 +36,28 @@ class PostsController < ApplicationController
oembed = params.slice(:format, :maxheight, :minheight)
render json: OEmbedPresenter.new(post, oembed)
rescue
- render nothing: true, status: 404
+ head :not_found
end
- def interactions
+ def mentionable
respond_to do |format|
format.json {
- post = post_service.find!(params[:id])
- render json: PostInteractionPresenter.new(post, current_user)
+ if params[:id].present? && params[:q].present?
+ render json: post_service.mentionable_in_comment(params[:id], params[:q])
+ else
+ head :no_content
+ end
}
- format.any { render nothing: true, status: 406 }
+ format.any { head :not_acceptable }
end
+ rescue ActiveRecord::RecordNotFound
+ head :not_found
end
def destroy
post_service.destroy(params[:id])
respond_to do |format|
- format.json { render nothing: true, status: 204 }
+ format.json { head :no_content }
format.any { redirect_to stream_path }
end
end
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index bb4d9b070..9daa4640d 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -48,7 +48,7 @@ class ProfilesController < ApplicationController
end
respond_to do |format|
- format.js { render :nothing => true, :status => 200 }
+ format.js { head :ok }
format.any {
if current_user.getting_started?
redirect_to getting_started_path
@@ -77,6 +77,6 @@ class ProfilesController < ApplicationController
def profile_params
params.require(:profile).permit(:first_name, :last_name, :gender, :bio,
:location, :searchable, :tag_string, :nsfw,
- :public_details, date: %i(year month day)) || {}
+ :public_details, date: %i[year month day]).to_h || {}
end
end
diff --git a/app/controllers/report_controller.rb b/app/controllers/report_controller.rb
index 8e0826c1f..f51d2d043 100644
--- a/app/controllers/report_controller.rb
+++ b/app/controllers/report_controller.rb
@@ -31,7 +31,7 @@ class ReportController < ApplicationController
if report.save
render json: true, status: 200
else
- render nothing: true, status: 409
+ head :conflict
end
end
diff --git a/app/controllers/reshares_controller.rb b/app/controllers/reshares_controller.rb
index 4add93174..d38f49f6a 100644
--- a/app/controllers/reshares_controller.rb
+++ b/app/controllers/reshares_controller.rb
@@ -5,9 +5,9 @@ class ResharesController < ApplicationController
def create
reshare = reshare_service.create(params[:root_guid])
rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid
- render text: I18n.t("reshares.create.error"), status: 422
+ render plain: I18n.t("reshares.create.error"), status: 422
else
- render json: ExtremePostPresenter.new(reshare, current_user), status: 201
+ render json: PostPresenter.new(reshare, current_user).with_interactions, status: 201
end
def index
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f3a320615..e1f754a43 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,24 +1,24 @@
class SearchController < ApplicationController
before_action :authenticate_user!
-
+
def search
if search_query.starts_with?('#')
if search_query.length > 1
- respond_to do |format|
+ respond_to do |format|
format.json {redirect_to tags_path(:q => search_query.delete("#."))}
format.any {redirect_to tag_path(:name => search_query.delete("#."))}
end
else
flash[:error] = I18n.t('tags.show.none', :name => search_query)
- redirect_to :back
+ redirect_back fallback_location: stream_path
end
else
redirect_to people_path(:q => search_query)
- end
+ end
end
-
+
private
-
+
def search_query
@search_query ||= (params[:q] || params[:term] || '').strip
end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 61f464209..74fd1f818 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -3,8 +3,8 @@
# the COPYRIGHT file.
class SessionsController < Devise::SessionsController
- after_filter :reset_authentication_token, :only => [:create]
- before_filter :reset_authentication_token, :only => [:destroy]
+ after_action :reset_authentication_token, only: [:create]
+ before_action :reset_authentication_token, only: [:destroy]
def reset_authentication_token
current_user.reset_authentication_token! unless current_user.nil?
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index e65e4b54a..58ae46536 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -47,14 +47,8 @@ class StatusMessagesController < ApplicationController
end
def create
- normalized_params = params.merge(
- services: normalize_services,
- aspect_ids: normalize_aspect_ids,
- public: normalize_public_flag
- )
- status_message = StatusMessageCreationService.new(current_user).create(normalized_params)
+ status_message = StatusMessageCreationService.new(current_user).create(normalize_params)
respond_to do |format|
- format.html { redirect_to :back }
format.mobile { redirect_to stream_path }
format.json { render json: PostPresenter.new(status_message, current_user), status: 201 }
end
@@ -71,9 +65,8 @@ class StatusMessagesController < ApplicationController
def handle_create_error(error)
logger.debug error
respond_to do |format|
- format.html { redirect_to :back }
format.mobile { redirect_to stream_path }
- format.json { render text: error.message, status: 403 }
+ format.json { render plain: error.message, status: 403 }
end
end
@@ -89,8 +82,19 @@ class StatusMessagesController < ApplicationController
request.env["HTTP_REFERER"].include?("/people/" + current_user.guid)
end
- def normalize_services
- [*params[:services]].compact
+ def normalize_params
+ params.permit(
+ :location_address,
+ :location_coords,
+ :poll_question,
+ status_message: %i[text provider_display_name],
+ poll_answers: []
+ ).to_h.merge(
+ services: [*params[:services]].compact,
+ aspect_ids: normalize_aspect_ids,
+ public: [*params[:aspect_ids]].first == "public",
+ photos: [*params[:photos]].compact
+ )
end
def normalize_aspect_ids
@@ -102,10 +106,6 @@ class StatusMessagesController < ApplicationController
end
end
- def normalize_public_flag
- [*params[:aspect_ids]].first == "public"
- end
-
def remove_getting_started
current_user.disable_getting_started
end
diff --git a/app/controllers/tag_followings_controller.rb b/app/controllers/tag_followings_controller.rb
index 72ca6fd24..a82d16dd9 100644
--- a/app/controllers/tag_followings_controller.rb
+++ b/app/controllers/tag_followings_controller.rb
@@ -15,7 +15,7 @@ class TagFollowingsController < ApplicationController
name_normalized = ActsAsTaggableOn::Tag.normalize(params['name'])
if name_normalized.nil? || name_normalized.empty?
- render :nothing => true, :status => 403
+ head :forbidden
else
@tag = ActsAsTaggableOn::Tag.find_or_create_by(name: name_normalized)
@tag_following = current_user.tag_followings.new(:tag_id => @tag.id)
@@ -23,7 +23,7 @@ class TagFollowingsController < ApplicationController
if @tag_following.save
render :json => @tag.to_json, :status => 201
else
- render :nothing => true, :status => 403
+ head :forbidden
end
end
end
@@ -35,11 +35,11 @@ class TagFollowingsController < ApplicationController
if tag_following && tag_following.destroy
respond_to do |format|
- format.any(:js, :json) { render :nothing => true, :status => 204 }
+ format.any(:js, :json) { head :no_content }
end
else
respond_to do |format|
- format.any(:js, :json) {render :nothing => true, :status => 403}
+ format.any(:js, :json) { head :forbidden }
end
end
end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 30ddfec00..d201fd905 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -24,8 +24,8 @@ class TagsController < ApplicationController
end
else
respond_to do |format|
- format.json{ render :nothing => true, :status => 422 }
- format.html{ redirect_to tag_path('partytimeexcellent') }
+ format.json { head :unprocessable_entity }
+ format.html { redirect_to tag_path("partytimeexcellent") }
end
end
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 262d0bb16..e6dbb3449 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -46,7 +46,7 @@ class UsersController < ApplicationController
flash[:error] = t("users.update.settings_not_updated")
end
- redirect_to :back
+ redirect_back fallback_location: privacy_settings_path
end
def destroy
@@ -60,7 +60,7 @@ class UsersController < ApplicationController
else
flash[:error] = t "users.destroy.no_password"
end
- redirect_to :back
+ redirect_back fallback_location: edit_user_path
end
end
@@ -150,16 +150,7 @@ class UsersController < ApplicationController
:auto_follow_back_aspect_id,
:getting_started,
:post_default_public,
- email_preferences: %i(
- someone_reported
- also_commented
- mentioned
- comment_on_post
- private_message
- started_sharing
- liked
- reshared
- )
+ email_preferences: UserPreference::VALID_EMAIL_TYPES.map(&:to_sym)
)
end
# rubocop:enable Metrics/MethodLength
diff --git a/app/helpers/analytics_helper.rb b/app/helpers/analytics_helper.rb
deleted file mode 100644
index df7f69c6e..000000000
--- a/app/helpers/analytics_helper.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (c) 2010-2012, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
-
-module AnalyticsHelper
- def include_mixpanel
- include_analytics "mixpanel" do
- nonced_javascript_tag do
- <<-JS.html_safe
- (function(d,c){var a,b,g,e;a=d.createElement('script');a.type='text/javascript';a.async=!0;a.src=('https:'===d.location.protocol?'https:':'http:')+'//api.mixpanel.com/site_media/js/api/mixpanel.2.js';b=d.getElementsByTagName('script')[0];b.parentNode.insertBefore(a,b);c._i=[];c.init=function(a,d,f){var b=c;'undefined'!==typeof f?b=c[f]=[]:f='mixpanel';g='disable track track_pageview track_links track_forms register register_once unregister identify name_tag set_config'.split(' ');
- for(e=0;e
- {{#if loggedIn}}
-
- {{/if}}
+ {{#unless preview}}
+ {{#if loggedIn}}
+
+ {{/if}}
-
-
-
-
-
+ {{#unless preview}}
+
+
+
+
+ {{/unless}}
- {{#linkToAuthor author}}
- {{~name~}}
- {{/linkToAuthor}}
+
+
+
+ {{/unless}}
%{data}" confirm_deletion: "Sètz segur que volètz suprimir aqueste element ?" delete_link: "Suprimir l'element" - not_found: "La publicacion/comentari es pas estat trobat. Sembla qu'es estat suprimit per l'utilizaire !" + not_found: "La publicacion/comentari es pas estat trobat. Sembla qu'es estat suprimit per l'utilizaire !" post_label: "Publicacion: %{title}" reason_label: "Rason :" reported_label: "Senhalat per %{person}" @@ -1026,7 +1034,7 @@ oc: by_email: "Convidar de monde per corrièl" invite_your_friends: "Convidatz vòstres amics" invites: "Convits" - share_this: "Partejatz aqueste ligam via corrièl, blog, o malhums socials !" + share_this: "Partejatz aqueste ligam via corrièl, blog, o malhums socials !" public_explain: atom_feed: "Flux Atom" control_your_audience: "Contrarotlatz vòstra audiéncia" @@ -1079,7 +1087,7 @@ oc: version: "Version" status_messages: new: - mentioning: "Menciona : %{person}" + mentioning: "Menciona : %{person}" too_long: "Avisatz-vos d'escriure un messatge d'estatut de %{count} caractèrs maximum. Compta actualament %{current_length} caractèrs." stream_helper: no_more_posts: "Avètz atent la fin d'aqueste flux." @@ -1116,16 +1124,16 @@ oc: public: title: "Activitat publica" tags: - title: "Messatges etiquetats : %{tags}" + title: "Messatges etiquetats : %{tags}" tag_followings: manage: - no_tags: "Seguissètz pas cap de tag." - title: "Gerir los tags seguits." + no_tags: "Seguissètz pas cap d'etiquetas." + title: "Gerir las etiquetas" tags: name_too_long: "Vòstre tag deu far mens de %{count} caractèrs ( actualament, %{current_length})" show: follow: "Seguir #%{tag}" - none: "L'etiqueta voida existís pas !" + none: "L'etiqueta voida existís pas !" stop_following: "Quitar de seguir #%{tag}" tagged_people: one: "1 persona marcada amb %{tag}" @@ -1147,16 +1155,16 @@ oc: change: "Modificar" change_color_theme: "Cambiar lo tèma de color" change_email: "Cambiar de corrièl" - change_language: "Cambiar de lenga" + change_language: "Cambiar la lenga" change_password: "Cambiar lo senhal" character_minimum_expl: "deu conténer sièis caractèrs al minim" close_account: - dont_go: "E, se vos plai, patiscatz pas !" + dont_go: "E, se vos plai, patiscatz pas !" lock_username: "Vòstre nom d'utilizaire serà verrolhat. Poiretz pas crear un novèl compte sus aqueste pod amb lo meteis ID." locked_out: "Seretz desconnectat e vòstre compte serà inaccessible fins a sa supression." make_diaspora_better: "Nos agradariá fòrça que demorèssetz e nos ajudèssetz a far un melhor diaspora* puslèu que de nos daissar. Se volètz vertadièrament partir, pasmens, vaquí çò que se va passar :" mr_wiggles: "Mossur Wiggles serà triste de vos veire partir." - no_turning_back: "Es pas possible de tornar en arrièr ! Se sètz segur de vos, sasissètz vòstre senhal çaijós." + no_turning_back: "Es pas possible de tornar en arrièr ! Se sètz segur de vos, sasissètz vòstre senhal çaijós." what_we_delete: "Suprimirem totas vòstras publicacions e informacions de perfil tre que possible. Vòstres comentaris sus la publicacion del mond desapareisseràn, mai seràn associats a vòstre ID diaspora* al lòc de vòstre nom." close_account_text: "Tampar lo compte" comment_on_post: "qualqu'un comenta vòstra publicacion" @@ -1174,6 +1182,7 @@ oc: last_exported_at: "(Darrièra mesa a jorn a %{timestamp})" liked: "a qualqu'un li a agradat vòstra publicacion" mentioned: "...se vos menciona dins un messatge." + mentioned_in_comment: "sètz mencionat dins un comentari" new_password: "Senhal novèl" private_message: "Avètz recebut un messatge privat." receive_email_notifications: "Recebre una notificacion per corrièl quand :" @@ -1191,13 +1200,13 @@ oc: your_email_private: "Vòstre email serà pas jamai vist per d'autres utilizaires" your_handle: "Vòstre ID diaspora*" getting_started: - awesome_take_me_to_diaspora: "Òsca ! Mena-me cap a diaspora*" + awesome_take_me_to_diaspora: "Òsca ! Mena-me cap a diaspora*" community_welcome: "La comunautat diaspora* es contenta de vos aver a bòrd." connect_to_facebook: "Podèm accelerar un pauc las causas de %{link} sus diaspora*. Aquò botarà vòstre nom e foto, e activar la publicacion multiplataforma." connect_to_facebook_link: "Connexion amb vòtre compte Facebook en cors" - hashtag_explanation: "Las etiquetas vos permeton de charrar e seguir vòstres interèsses. Son tanben una bona manièra de trobar de mond novèl sus diaspora*." + hashtag_explanation: "Las etiquetas vos permeton de charrar e seguir vòstres interèsses. Son tanben una bona manièra de trobar de mond novèl sus diaspora*." hashtag_suggestions: "Ensajatz etiquetas coma aquestas #art #filmes #gif, etc." - well_hello_there: "E ben, adiu monde !" + well_hello_there: "E ben, adiu monde !" what_are_you_in_to: "Qué vos interèssa ?" who_are_you: "Qual sètz ?" privacy_settings: @@ -1207,7 +1216,7 @@ oc: strip_exif: "Levar dels imatges mandats las metadonadas talas coma luòc de presa, autor o modèl d'aparelh fòto (recomandat)" title: "Reglatges de confidencialitat" public: - does_not_exist: "L'utilizaire %{username} existís pas !" + does_not_exist: "L’utilizaire %{username} existís pas !" update: color_theme_changed: "Tèma de color cambiat." color_theme_not_changed: "Una error s'es produita pendent lo cambiament de tèma de color." diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml index 10dadedea..e32d4f0aa 100644 --- a/config/locales/diaspora/pl.yml +++ b/config/locales/diaspora/pl.yml @@ -46,7 +46,7 @@ pl: taken: "jest już zajęta." admins: admin_bar: - dashboard: "Deska rozdzielcza" + dashboard: "Panel" pages: "Strony" pod_network: "Sieć poda" pod_stats: "Statystyki Poda" @@ -55,7 +55,7 @@ pl: user_search: "Wyszukiwanie użytkowników" weekly_user_stats: "Tygodniowe statystyki użytkowników" dashboard: - fetching_diaspora_version: "Ustalanie najnowszej wersji diaspory*" + fetching_diaspora_version: "Ustalanie najnowszej wersji diaspory*..." pod_status: "Stan poda" pods: pod_desktop_link: "pełna wersja strony" @@ -63,16 +63,16 @@ pl: pod_network: "Sieć poda" stats: 2weeks: "2 tygodnie" - 50_most: "50 najpopularniejszych znaczników" + 50_most: "50 najpopularniejszych tagów" comments: few: "%{count} komentarze" many: "%{count} komentarzy" one: "%{count} komentarz" other: "%{count} komentarzy" zero: "Brak komentarzy" - current_segment: "Obecny segment ma średnio %{post_yest} wpisów na użytkownika, z %{post_day}." + current_segment: "Obecny segment ma średnio %{post_yest} wpisów na użytkownika, z %{post_day}." daily: "Dziennie" - display_results: "Wyświetlanie wyników z segmentu %{segment}" + display_results: "Wyświetlanie wyników z segmentu %{segment}" go: "Idź" month: "Miesiąc" posts: @@ -87,7 +87,7 @@ pl: one: "%{count} udostępnienie" other: "%{count} udostępnień" zero: "Nie udostępniono" - tag_name: "Nazwa znacznika: %{name_tag} Licznik: %{count_tag}" + tag_name: "Nazwa tagu: %{name_tag} Licznik: %{count_tag}" usage_statistic: "Statystyki" users: few: "%{count} użytkowników" @@ -98,10 +98,11 @@ pl: week: "Tydzień" user_entry: account_closed: "konto zamknięte" - diaspora_handle: "Identyfikator Diaspory" + diaspora_handle: "identyfikator w diasporze*" email: "Email" guid: "GUID" id: "ID" + invite_token: "Token zaproszenia" last_seen: "ostatnio widziany" ? "no" : nie @@ -119,6 +120,7 @@ pl: are_you_sure_unlock_account: "Na pewno odblokować to konto?" close_account: "zamknij konto" email_to: "Zaproś przez e-mail" + invite: "Zaproś" lock_account: "Zablokuj konto" under_13: "Wyświetl użytkowników młodszych niż 13 lat." unlock_account: "Odblokuj konto" @@ -197,7 +199,7 @@ pl: aspect_stream: make_something: "Zrób coś" stay_updated: "Bądź na bieżąco" - stay_updated_explanation: "Główny strumień jest wypełniony przez wszystkie Twoje kontakty, znaczniki które obserwujesz i wpisy niektórych bardziej kreatywnych członków społeczności." + stay_updated_explanation: "Główny strumień jest wypełniony przez wszystkie Twoje kontakty, tagi które obserwujesz i wpisy niektórych bardziej kreatywnych członków społeczności." destroy: failure: "%{name} nie mógł być usunięty." success: "%{name} został usunięty." @@ -229,21 +231,21 @@ pl: tag_question: "pytanie" tutorial_link_text: "Samouczki" tutorials_and_wiki: "%{faq}, %{tutorial} i %{wiki}: Pomoc w Twoich pierwszych krokach." - introduce_yourself: "Oto Twoj strumień. Wskocz do niego i przedstaw się." + introduce_yourself: "Oto Twoj strumień. Wskakuj i przedstaw się." keep_pod_running: "Aby %{pod} działał szybko podaruj serwerom dawkę kofeiny w postaci miesięcznej darowizny!" new_here: - follow: "Obserwuj %{link} i powitaj nowych użytkowników diaspory*!" + follow: "Obserwuj %{link} i witaj nowych użytkowników diaspory*!" learn_more: "Dowiedz się więcej" title: "Powitaj nowych użytkowników" services: - content: "Z siecią Diaspora* można połączyć następujące usługi:" - heading: "Podłącz usługi" - welcome_to_diaspora: "Witaj w Diasporze, %{name}!" + content: "Z siecią diaspora* można połączyć następujące usługi:" + heading: "Połącz usługi" + welcome_to_diaspora: "Witaj na diasporze*, %{name}!" no_contacts_message: community_spotlight: "w centrum uwagi" - invite_link_text: "Zaproś" + invite_link_text: "zaproś" or_spotlight: "Lub możesz udostępnić z %{link}" - try_adding_some_more_contacts: "Możesz wyszukać lub zaprosić więcej osób." + try_adding_some_more_contacts: "Wyszukaj lub %{invite_link} więcej osób." you_should_add_some_more_contacts: "Dodaj więcej kontaktów!" seed: acquaintances: "Dalsi znajomi" @@ -258,12 +260,12 @@ pl: failure: "Nie mogę zignorować tego użytkownika. #unikanie" success: "Dobra, ten użytkownik nie pojawi się ponownie w Twoim strumieniu. #silencio!" destroy: - failure: "Nie mogę przestać ignorować tego użytkownika. #unikanie" + failure: "Nie mogę przestać ignorować tego użytkownika. #unikanie" success: "Zobaczmy co mają do powiedzenia! #powiedzcześć" bookmarklet: explanation: "Publikuj w diasporze* z dowolnego miejsca poprzez dodanie tego linku do zakładek => %{link}" heading: "Bookmarklet" - post_something: "Opublikuj w Diasporze" + post_something: "Opublikuj na diasporze*" cancel: "Anuluj" comments: create: @@ -329,18 +331,18 @@ pl: correct_the_following_errors_and_try_again: "Popraw poniższe błędy i spróbuj ponownie." need_javascript: "Strona do poprawnego działania wymaga obsługi JavaScriptu. Jeśli ją wyłączyłeś, proszę byś ją włączył i odświeżył stronę." fill_me_out: "Wypełnij mnie" - find_people: "Znajdź osoby lub #znaczniki" + find_people: "Znajdź osoby lub #tagi" help: account_and_data_management: close_account_a: "Przejdź na dół strony z Twoimi ustawieniami i kliknij przycisk Zamknij Konto. Będziesz potrzebować hasła aby zakończyć proces. Pamiętaj jednak, że jeżeli zamkniesz konto, nigdy nie będziesz w stanie utworzyć ponownie konta o tej samej nazwie." close_account_q: "Jak usunę moje konto?" - data_other_podmins_a: "Od momentu kiedy zaczniesz udostępniać komuś na innym podzie, wszystkie Twoje wpisy, a także Twój profil są zapisane (jako tzw. cache) na jego podzie, i dostępne dla jego administratora. Jeśli skasujesz wpis lub dane ze swojego profilu, są one kasowane na Twoim podzie i żądanie skasowania jest wysyłane do wszystkich podów na których były przechowywane. Zdjęcia są zawsze przechowywane tylko na twoim podzie i tylko łącza do nich są przesyłane do innych podów." + data_other_podmins_a: "Od momentu kiedy zaczniesz udostępniać komuś na innym podzie, wszystkie Twoje wpisy, a także Twój profil są zapisane (jako tzw. cache) na jego podzie, i dostępne dla jego administratora. Jeśli skasujesz wpis lub dane ze swojego profilu, są one kasowane na Twoim podzie i żądanie skasowania jest wysyłane do wszystkich podów na których były przechowywane. Zdjęcia są zawsze przechowywane tylko na Twoim podzie i tylko łącza do nich są przesyłane do innych podów." data_other_podmins_q: "Czy administrator innego poda może zobaczyć moje dane?" data_visible_to_podmin_a: "Komunikacja między podami jest zawsze szyfrowana (przy użyciu SSL/TLS i własnego szyfrowania diaspory*), ale dane przechowywane na podzie nie są zaszyfrowane. Administrator poda (zwykle jego właściciel) jeśli zechce, ma dostęp do danych Twojego profilu i wszystkiego co udostępniasz. Nie odbiega to od standardowej sytuacji w innych serwisach przechowujących dane użytkowników. Posiadanie własnego poda zwiększa poziom prywatności, ponieważ wtedy sam kontrolujesz dostęp do bazy danych." data_visible_to_podmin_q: "Ile z moich danych może zobaczyć administrator poda, na którym jestem zarejestrowan@{f:a|m:y|n:y/a}?" - download_data_a: "Tak. Na dole działu Konto na stronie z Twoimi ustawieniami znajdują się dwa przyciski służące do pobierania danych - jeden dla danych jeden dla zdjęć." + download_data_a: "Tak. Na dole karty Konto na stronie z Twoimi ustawieniami znajdują się dwa przyciski służące do pobierania danych – jeden dla danych i jeden dla zdjęć." download_data_q: "Czy mogę pobrać kopię wszystkich danych z mojego konta?" - move_pods_a: "W przyszłości będzie można wyeksportować konto z poda i zaimportować je na innym, ale tymczasowo jest to niemożliwe. Zawsze jednak możesz założyć nowe konto, dodać swoje kontakty do jego aspektów i poprosić znajomych żeby dodali do swoich aspektów twoje nowe konto." + move_pods_a: "Wersja 0.7.0.0 diaspory* pozwala już na częściową migrację konta: w sekcji \"Konto\" w ustawieniach możesz wyeksportować wszystkie swoje dane. Trzymaj je w bezpiecznym miejscu! W przyszłym wydaniu diaspory* będziesz mógł dokonać pełnej migracji do innego poda, włącznie ze wszystkimi wpisami i kontaktami." move_pods_q: "Jak przenieść konto z jednego poda na drugi?" title: "Zarządzanie kontem i danymi" aspects: @@ -379,12 +381,12 @@ pl: get_support_a_hashtag: "Zapytaj o diasporę* w publicznym wpisie używając tagu %{question}" get_support_a_irc: "Dołącz do nas na %{irc} w rozmowie na żywo" get_support_a_tutorials: "Sprawdć nasze %{tutorials}" - get_support_a_website: "Odwiedź naszą %{link}" + get_support_a_website: "Odwiedź następującą witrynę: %{link}" get_support_a_wiki: "Przeszukaj %{link}" get_support_q: "Co zrobić jeśli nie znajduję odpowiedzi w tym FAQ? Gdzie jeszcze mogę znaleźć wsparcie?" getting_started_a: "Masz szczęście. Wypróbuj %{tutorial_series} na stronie naszego projektu. Poprowadzą Cię, krok po kroku, przez proces rejestracji i nauczą wszystkich podstaw poruszanie się po diasporze*." getting_started_q: "Pomocy! Potrzebuję podstawowych rad na początek." - title: "Uzyskaj pomoc." + title: "Uzyskaj pomoc" getting_started_tutorial: "Serię samouczków \"Pierwsze kroki\"" here: "tutaj" irc: "IRC" @@ -404,7 +406,6 @@ pl: mentions: how_to_mention_a: "Wprowadź znak \"@\", a po nim zacznij wpisywać imię osoby. Pojawi się menu, które pozwoli Ci wybrać tą osobę. Pamiętaj, że w ten sposób wspomnisz tylko o osobach, które dodałeś do któregoś z aspektów." how_to_mention_q: "Jak wspomnieć o kimś we wpisie?" - mention_in_comment_a: "Aktualnie nie." mention_in_comment_q: "Czy mogę wspomnieć o kimś w komentarzu?" see_mentions_a: "Tak, kliknij \"Wzmianki\" po lewej stronie Twojej strony głównej." see_mentions_q: "Czy mogę jakoś zobaczyć wpisy, w których zostałem wspomniany?" @@ -428,26 +429,22 @@ pl: use_search_box_a: "Jeśli znasz jej pełen identyfikator (typu nazwauzytkownika@jakispod.org), znajdziesz ją wpisując w pole ten identyfikator. Jeśli jesteście na tym samym podzie, możesz wyszukiwać po samej nazwie użytkownika. Można też spróbować wyszukiwać według nazwy ekranowej (np. imię i nazwisko). Jeśli wyszukiwanie nie uda się za pierwszym razem, spróbuj ponownie." use_search_box_q: "Jak korzystać z pola wyszukiwania, żeby znaleźć konkretną osobę?" what_is_a_pod_a: "Pod to serwer, na którym uruchomiona jest aplikacja diaspory*, połączony z siecią diaspora*. \"Pod\" z angielskiego to miejsce w roślinie, w którym znajdują się nasiona. Istnieje wiele podów w sieci. Możesz mieć znajomych na innych podach i komunikować się z nimi. diaspora* jest pod tym względem podobna do systemu e-mailowego. Istnieją pody publiczne, pody prywatne a niewielkim nakładem pracy możesz nawet założyć własny pod." - what_is_a_pod_q: "Czym jest \"pod\"?" + what_is_a_pod_q: "Czym jest pod?" posts_and_posting: - char_limit_services_a: "W takim przypadku twój wpis jest ograniczony do niższego limitu znaków (140 dla Twittera; 1000 dla Tumblr'a), a ilość znaków jaka została ci do wykorzystania jest pokazana kiedy ikona połączonego serwisu jest podświetlona. Wpis możesz nadal wysłać do połączonego serwisu jeśli jest dłuższy niż limit znaków, ale będzie tam dostępny w obciętej formie z odnośnikiem do postu na diasporze*." + char_limit_services_a: "W takim przypadku twój wpis jest ograniczony do niższego limitu znaków (140 dla Twittera; 1000 dla Tumblr'a), a ilość znaków jaka została Ci do wykorzystania jest pokazana kiedy ikona połączonego serwisu jest podświetlona. Wpis możesz nadal wysłać do połączonego serwisu jeśli jest dłuższy niż limit znaków, ale będzie tam dostępny w obciętej formie z odnośnikiem do postu na diasporze*." char_limit_services_q: "Jaki jest limit znaków dla wpisów dodawanych przez połączone serwisy z mniejszym limitem znaków?" character_limit_a: "65 535 znaków. To o 65 395 więcej niż jest dostępne na Twitterze! ;)" character_limit_q: "Jaki jest limit znaków dla wpisu?" - embed_multimedia_a: "Zazwyczaj możesz po prostu wkleić URL (np. http://www.youtube.com/watch?v=nnnnnnnnnnn ) do swojego wpisu, a wideo lub muzyka zostanie w niego automatycznie włączona. Niektóre wspierane strony to: YouTube, Vimeo, SoundCloud, Flickr i kilka innych. diaspora* używa oEmbed do udostępnienia tej funkcjonalności. Nieustannie dodajemy wsparcie dla nowych stron. Pamiętaj aby zawsze wklejać proste, pełne odnośniki: nie skracaj linków; nie dodawaj żadnych operatorów po bazowym URLu. Po dodaniu wpisu musisz chwilę poczekać aż podgląd będzie dostępny." + embed_multimedia_a: "Zazwyczaj możesz po prostu wkleić URL (np. http://www.youtube.com/watch?v=nnnnnnnnnnn ) do swojego wpisu, a wideo lub muzyka zostanie w niego automatycznie włączona. Niektóre wspierane strony to: YouTube, Vimeo, SoundCloud, Flickr i kilka innych. diaspora* używa oEmbed do udostępnienia tej funkcji. Nieustannie dodajemy wsparcie dla nowych stron. Pamiętaj aby zawsze wklejać proste, pełne odnośniki: nie skracaj linków; nie dodawaj żadnych operatorów po bazowym URL-u. Po dodaniu wpisu musisz chwilę poczekać aż podgląd będzie dostępny." embed_multimedia_q: "Jak mogę osadzić wideo, audio lub inną treść mutltimedialną we wpisie?" - format_text_a: "Używając uproszczonego systemu nazywanego %{markdown}. Pełną składnię Markdown możesz znaleźć %{here}. Przycisk podglądu jest tutaj bardzo przydatny - możesz dzięki niemu sprawdzić jak będzie wyglądać twój wpis zanim go udostępnisz." + format_text_a: "diaspora* używa prostego systemu zwanego %{markdown}. Edytor posiada przyciski ułatwiające formatowanie tekstu. Jeśli chcesz robić to ręcznie, więcej informacji na temat Markdown znajdziesz %{here}. Dzięki karcie Podglądu możesz jeszcze przed wysłaniem zobaczyć jak wiadomość będzie wyglądała. Miej na uwadze, że nie ma możliwości edytowania wpisów, więc staraj się by wszystko wyglądało perfekcyjnie zanim Udostępnisz wpis." format_text_q: "Jak mogę formatować tekst w moich wpisach (pogrubiać go, dodać kursywę itp.)?" hide_posts_a: "Jeśli nakierujesz kursor na górę wpisu, po prawej stronie pojawi się X. Kliknij go aby ukryć ten wpis i wyciszyć powiadomienia dotyczące go. Wciąż będziesz mógł zobaczyć ten wpis jeśli przejdziesz na stronę profilową osoby, która go udostępniła." hide_posts_q: "Jak ukryć wpis? / Jak wyłączyć powiadomienia na temat wpisu skomentowanego przeze mnie?" - image_text: "tekst obrazka" - image_url: "adres url obrazka" insert_images_a: "Kliknij ikonę aparatu aby dodać zdjęcie do wpisu. Kliknij ikonę jeszcze raz aby dodać kolejne zdjęcie, lub zaznacz kilka plików aby dodać je jednocześnie." - insert_images_comments_a1: "Nie możesz dodać obrazów do komentarzy, ale możesz użyć poniższy kod Markdown aby dodać już istniejące obrazy z dowolnego miejsca w Sieci:" - insert_images_comments_a2: "może być użyty do wstawiania obrazków z Internetu w komentarzach i wpisach." insert_images_comments_q: "Czy mogę do komentarzy dodać zdięcia?" insert_images_q: "Jak mogę dodać do wpisów zdięcia?" - post_location_a: "Kliknij ikonę szpilki obok ikony aparatu. To doda twoją lokalizację z OpenStreetMap. Możesz też edytować tą lokalizację – na przykład możesz ograniczyć precyzję lokalizacji tylko do miasta, nie konkretnej ulicy." + post_location_a: "Kliknij ikonę szpilki obok ikony aparatu. To doda Twoją lokalizację z OpenStreetMap. Możesz też edytować tę lokalizację – na przykład możesz ograniczyć precyzję lokalizacji tylko do miasta, nie konkretnej ulicy." post_location_q: "Jak dodać lokalizację do wpisu?" post_notification_a: "Koło X w prawym górnym rogu wpisu znajdziesz ikonę dzwonka. Kliknij ją aby włączyć bądź wyłączyć powiadomienia." post_notification_q: "Jak włączyć albo wyłączyć powiadomienia o wpisie?" @@ -459,8 +456,8 @@ pl: size_of_images_q: "Czy mogę dostosować wymiary obrazków we wpisach lub komentarzach?" stream_full_of_posts_a1: "Twój strumień składa się z trzech rodzajów wpisów:" stream_full_of_posts_li1: "Wpisów od ludzi, z którymi się dzielisz, które występują w dwóch odmianach: publicznych i ograniczonych (udostępnionych jedynie poszczególnym aspektom). Aby usunąć te wpisy ze swojego strumienia wystarczy przestać dzielić się z daną osobą." - stream_full_of_posts_li2: "Wpisy publiczne zawierające jeden z tagów, które obserwujesz. Aby usunąć je przestać obserwować dany tag." - stream_full_of_posts_li3: "Publiczne wpisy ludzi znajdujących się w centrum uwagi. Te wpisy mogą być usunięte przez odznaczenie opcji \"Pokaż centrum uwagi w strumieniu\" w zakładce Konto w twoich Ustawieniach." + stream_full_of_posts_li2: "Wpisy publiczne zawierające jeden z tagów, które obserwujesz. Aby usunąć je przestań obserwować dany tag." + stream_full_of_posts_li3: "Publiczne wpisy ludzi znajdujących się w centrum uwagi. Te wpisy mogą być usunięte przez odznaczenie opcji \"Pokaż centrum uwagi w strumieniu\" w zakładce Konto w Twoich Ustawieniach." stream_full_of_posts_q: "Dlaczego mój strumień jest pełen wpisów od ludzi, których nie znam i z którymi się nie dzielę?" title: "Wpisy i udostępnianie" private_posts: @@ -473,40 +470,27 @@ pl: title: "Wpisy prywatne" who_sees_post_a: "Jedynie zalogowani użytkownicy diaspory*, którzy znajdowali się w tym aspekcie podczas udostępnienia prywatnego wpisu mogą go zobaczyć." who_sees_post_q: "Kiedy udostępniam wpis w ramach określonego aspektu (t.j. udostępniam wpis prywatny) kto może go zobaczyć?" - private_profiles: - title: "Profile prywatne" - whats_in_profile_a: "Biografia, lokalizacja, płeć i data urodzin. To co znajduje się w dolnej części edytora profilu. Każda z tych informacji jest opcjonalna – to czy je wypełnisz zalezy wyłącznie od ciebie. Zalogowani użytkownicy, których dodałeś do swoich aspektów są jedynymi ludźmi, którzy mają dostęp do tych informacji. Widzą oni również twoje prywatne wpisy udostępnione w aspektach, w których się znajdują podczas przeglądania twojego profilu." - whats_in_profile_q: "Co znajduje się w moim prywatnym profilu?" - who_sees_profile_a: "Każdy zalogowany użytkownik, z którym się dzielisz (t.j. znajdujący się w jednym z twoich aspektów). Ludzie, którzy cię obserwują, ale których ty nie obserwujesz mogą zobaczyć jedynie twoje publicznie dostępne informacje." - who_sees_profile_q: "Kto może zobaczyć mój prywatny profil?" - who_sees_updates_a: "Każdy kto znajduje się w twoich aspektach widzi zmiany w twoim profilu. " - who_sees_updates_q: "Kto widzi aktualizacje w moim prywatnym profilu?" + profile: + title: "Profil" + what_do_tags_do_q: "Do czego służą tagi w moim profilu podstawowym?" + whats_in_profile_q: "Co znajduje się w moim profilu?" + who_sees_profile_q: "Kto widzi mój profil?" public_posts: - can_comment_reshare_like_a: "Każdy zalogowany użytkownik diaspory* może komentować, przekazywać i lubić twoje publiczne wpisy." + can_comment_reshare_like_a: "Każdy zalogowany użytkownik diaspory* może komentować, przekazywać i lubić Twoje publiczne wpisy. Jedynym wyjątkiem są osoby które ignorujesz: nie mogą one lubić ani komentować Twoich wpisów." can_comment_reshare_like_q: "Kto może komentować, przekazać i polubić mój publiczny wpis?" - deselect_aspect_posting_a: "Odznaczenie aspektów nie wpływa na publiczne wpisy. W dalszym ciągu będą one widoczne w strumieniach wszystkich twoich kontaktów. Aby udostępnić wpis jedynie wybranym aspektom musisz wybrać te aspekty korzystając z przycisku pod polem udostępniania." + deselect_aspect_posting_a: "Odznaczenie aspektów nie wpływa na publiczne wpisy. W dalszym ciągu będą one widoczne w strumieniach wszystkich Twoich kontaktów. Aby udostępnić wpis jedynie wybranym aspektom musisz wybrać te aspekty korzystając z przycisku pod polem udostępniania." deselect_aspect_posting_q: "Co się dzieje jeśli odznaczę jeden lub więcej aspektów kiedy udostępniam publiczny wpis?" - find_public_post_a: "Twoje publiczne wpisy pojawią się w strumieniu każdego kto cię obserwuje. Jeśli dodasz #tag do swojego publicznego wpisu, każdy kto obserwuje ten tag również znajdzie twój wpis w swoim strumieniu. Każdy wpis ma również unikalny URL, który każdy może zobaczyć nawet jeśli nie jest zalogowany - w ten sposób do wpisów można się odnosić bezpośrednio z Twittera, blogów itp. Publiczne wpisy mogą być również indeksowane przez wyszukiwarki." + find_public_post_a: "Twoje publiczne wpisy pojawią się w strumieniu każdego kto Cię obserwuje. Jeśli dodasz #tag do swojego publicznego wpisu, każdy kto obserwuje ten tag również znajdzie Twój wpis w swoim strumieniu. Każdy wpis ma również unikalny URL, który każdy może zobaczyć nawet jeśli nie jest zalogowany – w ten sposób do wpisów można się odnosić bezpośrednio z Twittera, blogów itp. Publiczne wpisy mogą być również indeksowane przez wyszukiwarki." find_public_post_q: "Jak inni ludzie mogą znaleźć mój publiczny wpis?" - see_comment_reshare_like_a: "Każdy zalogowany użytkownik diaspory* i każdy użytkownik Internetu. Komentarze, przekazania i polubienia publicznych wpisów są także publiczne." + see_comment_reshare_like_a: "Każdy zalogowany użytkownik diaspory* i każdy użytkownik Internetu może zobaczyć Twoją aktywność w publicznych wpisach. Komentarze, przekazania i polubienia publicznych wpisów są publiczne." see_comment_reshare_like_q: "Kiedy komentuję, przekazuję lub lubię publiczny wpis, kto może to zobaczyć?" title: "Wpisy publiczne" - who_sees_post_a: "Każdy użytkownik Internetu może zobaczyć twój publiczny wpis więc zawsze zastanów się czy chcesz udostępnić go publicznie. Jest to jednak świetny sposób na to żeby dać się poznać." + who_sees_post_a: "Każdy użytkownik Internetu może zobaczyć Twój publiczny wpis, więc zawsze zastanów się czy chcesz udostępnić go publicznie. Jest to jednak świetny sposób na to żeby dać się poznać." who_sees_post_q: "Kiedy udostępniam wpis publiczny, kto może go zobaczyć?" - public_profiles: - title: "Profile publiczne" - what_do_tags_do_a: "Pozwalają one ludziom zorientować się kim jesteś. Twoje zdjęcie pojawi się również z lewej strony stron tych konkretnych tagów, wraz ze zdjęciami innych ludzi, którzy dodali je do swoich publicznych profili." - what_do_tags_do_q: "O co chodzi z tagami w moim publicznym profilu?" - whats_in_profile_a: "W publicznym profilu znajduje się Twoje imię, pięć tagów jakimi się opisałeś i zdjęcie. Te rzeczy znajdują się w górnej sekcji edytora profilu. Możesz tu podać informacje, które pozwolą na identyfikację ciebie lub takie, które pozwolą ci zachować anonimowość. Twój publiczny profil zawiera również wszystkie twoje publiczne wpisy." - whats_in_profile_q: "Co znajduje się w moim publicznym profilu?" - who_sees_profile_a: "Każdy zalogowany użytkownik diaspory* jak również każdy użytkownik Internetu. Każdy profil ma swój bezpośredni URL więc mogą się do niego odnosić zewnętrzne strony. Może on być również indeksowany przez wyszukiwarki." - who_sees_profile_q: "Kto widzi mój publiczny profil?" - who_sees_updates_a: "Każdy może zobaczyć zmiany w twoim publicznym profilu jeśli odwiedzi twoją stronę profilową." - who_sees_updates_q: "Kto widzi aktualizacje mojego publicznego profilu?" resharing_posts: reshare_private_post_aspects_a: "Nie. Przekazywanie ograniczonych wpisów nie jest możliwe. Jest to środek mający służyć respektowaniu intencji oryginalnego udostępniającego, który podzielił się nim jedynie z wybraną grupą ludzi." reshare_private_post_aspects_q: "Czy mogę przekazać prywatny wpis jedynie wybranym aspektom?" - reshare_public_post_aspects_a: "Nie. Kiedy przekazujesz publiczny wpis automatycznie staje się on jednym z twoich publicznych wpisów. Aby przekazać go jedynie wybranym aspektom skopiuj jego zawartość i udostępnij jako nowy wpis." + reshare_public_post_aspects_a: "Nie. Kiedy przekazujesz publiczny wpis automatycznie staje się on jednym z Twoich publicznych wpisów. Aby przekazać go jedynie wybranym aspektom skopiuj jego zawartość i udostępnij jako nowy wpis." reshare_public_post_aspects_q: "Czy mogę przekazać publiczny wpis jedynie określonym aspektom?" title: "Przekazywanie wpisów" sharing: @@ -521,26 +505,26 @@ pl: add_to_aspect_li7: "Ania pojawi się w kategorii \"Jedynie mi udostępniają\" na stronie z kontaktami Bartka." add_to_aspect_li8: "Amy będzie także mogła @wspomnieć Bena w wpisie." add_to_aspect_q: "Co się dzieje kiedy dodaję kogoś do jednego z moich aspektów? Lub kiedy ktoś dodaje mnie do swoich aspektów?" - list_not_sharing_a: "Nie, ale możesz sprawdzić czy ktoś ci udostępnia odwiedzając jego stronę profilową. Jeśli dana osoba ci udostępnia, pasek pod jej zdjęciem będzie zielony, a jeśli nie - będzie on szary." + list_not_sharing_a: "Nie, ale możesz sprawdzić czy ktoś Ci udostępnia odwiedzając jego stronę profilową. Jeśli dana osoba Ci udostępnia, obok jej ID będzie się znajdować zielony ptaszek. Jeśli nie, szary okrąg." list_not_sharing_q: "Czy jest dostępna lista osób, które dodałem do moich aspektów, ale które nie udostępniają mi?" - only_sharing_a: "Są to ludzie, którzy dodali cię do swoich aspektów, ale których ty (jeszcze) nie dodałeś do żadnego ze swoich aspektów. Innymi słowy, ci, którzy udostępniają tobie, ale którym nie udostępniasz ty (zgodnie z udostępnianiem asymetrycznym). Jeśli dodasz kogoś z tej listy do jakiegoś swojego aspektu zniknie on z tej kategorii, a pojawi się w danym aspekcie. Sprawdź powyżej." + only_sharing_a: "Są to ludzie, którzy dodali cię do swoich aspektów, ale których Ty (jeszcze) nie dodałeś do żadnego ze swoich aspektów. Innymi słowy, ci, którzy udostępniają Tobie, ale którym nie udostępniasz Ty (zgodnie z udostępnianiem asymetrycznym). Jeśli dodasz kogoś z tej listy do jakiegoś swojego aspektu zniknie on z tej kategorii, a pojawi się w danym aspekcie. Sprawdź powyżej." only_sharing_q: "Kim są ludzie pokazani w kategorii \"Jedynie mi udostępniają\" na mojej stronie z kontaktami?" - see_old_posts_a: "Nie. Ta osoba będzie widziała jedynie nowe wpisy udostępniane w tym aspekcie. Ta osoba (i wszyscy inni) może zobaczyć twoje stare publiczne wpisy na twojej stronie profilowej." + see_old_posts_a: "Nie. Ta osoba będzie widziała jedynie nowe wpisy udostępniane w tym aspekcie. Ta osoba (i wszyscy inni) może zobaczyć Twoje stare publiczne wpisy na Twojej stronie profilowej." see_old_posts_q: "Jeśli dodam kogoś do aspektu czy może on zobaczyć wpisy, które udostępniłem w tym aspekcie zanim zacząłem mu udostępniać?" sharing_notification_a: "Otrzymasz powiadomienia za każdym razem gdy ktoś zacznie udostępniać wpisy tobie." sharing_notification_q: "Kiedy dowiem się gdy ktoś zacznie udostępniać mi wpisy?" title: "Udostępnianie" tags: - filter_tags_a: "Ta funkcjonalność nie jest jeszcze dostępna bezpośrednio w diasporze*, ale istnieją pewne %{third_party_tools} które mogą ją zapewnić." + filter_tags_a: "Ta funkcja nie jest jeszcze dostępna bezpośrednio w diasporze*, ale istnieją pewne %{third_party_tools} które mogą ją zapewnić." filter_tags_q: "Czy mogę filtrować/wyrzucić określone tagi z mojego strumienia?" - followed_tags_a: "Po wyszukaniu tagu kliknij w przycisk na szczycie strony aby zacząć \"obserwować\" dany tag. Pojawi się on wtedy na twojej liście obserwowanych tagów po lewej stronie. Kliknięcie na jeden z obserwowanych tagów przeniesie cię na stronę danego tagu, gdzie możesz zobaczyć najnowsze wpisy, które go zawierają. Kliknij na #Obserwowane Tagi aby zobaczyć strumień wpisów zawierających jeden tagów, które obserwujesz. " + followed_tags_a: "Po wyszukaniu tagu kliknij w przycisk na szczycie strony aby zacząć \"obserwować\" dany tag. Pojawi się on wtedy na Twojej liście obserwowanych tagów po lewej stronie. Kliknięcie na jeden z obserwowanych tagów przeniesie Cię na stronę danego tagu, gdzie możesz zobaczyć najnowsze wpisy, które go zawierają. Kliknij na #Obserwowane Tagi aby zobaczyć strumień wpisów zawierających jeden tagów, które obserwujesz. Wpisy zawierające obserwowane tagi znajdą się także w Twoim strumieniu." followed_tags_q: "Czym są \"#Obserwowane Tagi\" i jak mogę obserwować tag?" people_tag_page_a: "To są ludzie, którzy wybrali ten tag aby opisać siebie w ich publicznych profilach." people_tag_page_q: "Kim są ludzie pokazani po lewej stronie strony tagu?" tags_in_comments_a: "Tag dodany do komentarza zostanie pokazany jako link to strony tego tagu, ale nie sprawi, że skomentowany wpis się na niej znajdzie. Grupowanie działa wyłącznie dla wpisów." tags_in_comments_q: "Czy mogę dodawać tagi do komentarzy czy tylko do wpisów?" title: "Tagi" - what_are_tags_for_a: "Tagi są sposobem na grupowanie wpisów, zazwyczaj ze względu na tematykę. Wyszukiwanie konkretnego tagu pokaże ci wszystkie wpisy zawierające dany tag (zarówno prywatne jak i publiczne). Pozwala to ludziom odnaleźć publiczne wpisy dotyczące spraw, które ich interesują" + what_are_tags_for_a: "Tagi są sposobem na grupowanie wpisów, zazwyczaj ze względu na tematykę. Wyszukiwanie konkretnego tagu pokaże ci wszystkie wpisy zawierające dany tag (zarówno prywatne jak i publiczne). Pozwala to ludziom odnaleźć publiczne wpisy dotyczące spraw, które ich interesują." what_are_tags_for_q: "Do czego służą tagi?" third_party_tools: "Narzędzia innych dostawców" title_header: "Pomoc" @@ -560,6 +544,7 @@ pl: contribute: "Współtwórz" create_an_account: "Stwórz konto" headline: "Witaj, przyjacielu." + make_yourself_an_admin: "Zostań administratorem" update_your_pod: "Zaktualizuj swój pod" invitation_codes: already_logged_in: "%{inviter} zaprosił Cię na ten pod, ale jesteś już zalogowany." @@ -570,7 +555,7 @@ pl: empty: "Podaj przynajmniej jeden adres e-mail." no_more: "Nie masz więcej zaproszeń." note_already_sent: "Zaproszenia zostały już wysłane do: %{emails}" - rejected: "Następujące adresy e-mail okazały się problematyczne:" + rejected: "Następujące adresy e-mail okazały się problematyczne: %{emails}" sent: "Zaproszenia zostały wysłane do: %{emails}" new: codes_left: @@ -580,7 +565,7 @@ pl: other: "%{count} zaproszeń na ten kod" zero: "Brak zaproszeń na ten kod" comma_separated_plz: "Można wprowadzić wiele adresów e-mail oddzielonych przecinkami." - invite_someone_to_join: "Zaproś kogoś do Diaspory!" + invite_someone_to_join: "Zaproś kogoś do diaspory*!" language: "Język" paste_link: "Udostępnij to łącze znajomym, aby zaprosić ich do Diaspory* lub wyślij je do nich przez e-mail." send_an_invitation: "Wyślij zaproszenie" @@ -588,6 +573,8 @@ pl: layouts: application: back_to_top: "Powrót na górę" + be_excellent: "Bądźcie dla siebie nawzajem cudowni! ♥" + discourse: "Dyskusje na temat projektu i wsparcie" powered_by: "Działa na oprogramowaniu diaspora*" public_feed: "Publiczny kanał diaspory* użytkownika %{name}" source_package: "Pobierz archiwum z kodem źródłowym" @@ -649,7 +636,7 @@ pl: reshared: "Przekazali dalej" show_all: "pokaż wszystkie" show_unread: "pokaż nieprzeczytane" - started_sharing: "Zaczęli ci udostępniać" + started_sharing: "Zaczęli Ci udostępniać" liked: few: "%{actors} polubili/ły Twój wpis %{post_link}." many: "%{actors} polubili/ły Twój wpis %{post_link}." @@ -701,7 +688,7 @@ pl: notifier: a_limited_post_comment: "Pojawił się nowy komentarz w ograniczonym wpisie na diasporze*. Zapoznaj się z nim." a_post_you_shared: "wpis." - a_private_message: "Masz nową wiadomość w diaspora*" + a_private_message: "Otrzymałeś nową prywatną wiadomość na diasporze*" also_commented: limited_subject: "Pojawił się nowy komentarz do wpisu, który komentowałeś" click_here: "Kliknij tutaj" @@ -729,7 +716,7 @@ pl: Napotkaliśmy na problem podczas przetwarzania Twoich prywatnych danych do pobrania. Spróbuj ponownie! - Na razie! + Przepraszamy, Automat e-mailowy diaspory*. subject: "Przykro nam, %{name}, ale wystąpił problem z Twoimi danymi" @@ -745,26 +732,28 @@ pl: subject: "%{name}, twoje zdjęcia są gotowe do pobrania." export_photos_failure_email: body: |- - Witaj %{name} + Cześć %{name}, - Wystąpił problem podczas przetwarzania twoich zdjęć do pobrania. - Proszę spróbuj ponownie! + Napotkaliśmy problem podczas przetwarzania Twoich zdjęć do pobrania. + Spróbuj ponownie! - Przepraszam, + Przepraszamy, - Emailowy robot diaspory* + Automat e-mailowy diaspory*. subject: "%{name}, wystąpił problem z twoimi zdjęciami" hello: "Cześć %{name}!" invite: message: |- Cześć! - Zaproszono Cię do diaspory*! + %{user} zaprosił(a) Cię do diaspory*! Kliknij ten link, aby rozpocząć rejestrację [%{invite_url}][1] + Jeżeli posiadasz już konto możesz dodać %{diaspora_id} do swoich kontaktów. + Z poważaniem @@ -853,7 +842,7 @@ pl: gender: "Płeć" location: "Lokalizacja" show: - closed_account: "Te konto zostało zamknięte." + closed_account: "To konto zostało zamknięte." does_not_exist: "Osoba nie istnieje!" has_not_shared_with_you_yet: "%{name} nie udostępnia Ci jeszcze żadnych wpisów!" photos: @@ -865,11 +854,18 @@ pl: notice: "Usunięto zdjęcie." new_profile_photo: upload: "Prześlij nowe zdjęcie profilowe!" + polls: + votes: + few: "jak dotąd %{count} głosy" + many: "jak dotąd %{count} głosów" + one: "jak dotąd %{count} głos" + other: "jak dotąd %{count} głosy" + zero: "jak dotąd %{count} głosów" posts: presenter: title: "Wpis od %{name}" show: - forbidden: "Nie masz pozwolenia by to zrobić." + forbidden: "Nie masz pozwolenia by to zrobić" location: "Wysłano z: %{location}" photos_by: few: "%{count} zdjęcia od %{author}" @@ -882,11 +878,11 @@ pl: profile: "Profil" profiles: edit: - allow_search: "Pozwól innym użytkownikom diaspory* na wyszukanie ciebie" + allow_search: "Pozwól innym użytkownikom diaspory* na wyszukanie Ciebie" basic: "Mój podstawowy profil" basic_hint: "Wszystkie elementy Twojego profilu są opcjonalne. Twój podstawowy profil zawsze będzie publicznie dostępny." extended: "Mój rozszerzony profil" - extended_hint: "Użyj przełącznika by ustawić widoczność Twojego rozszerzonego profilu. Publiczna oznacza, że będzie widoczny dla każdego z internecie, ograniczona, że tylko dla osób z którymi dzielisz się na Diasporze." + extended_hint: "Użyj przełącznika by ustawić widoczność Twojego rozszerzonego profilu. Publiczny oznacza, że będzie widoczny dla każdego w internecie, ograniczony, że tylko dla osób z którymi dzielisz się na diasporze*." extended_visibility_text: "Widoczność Twojego rozszerzonego profilu:" first_name: "Imię" last_name: "Nazwisko" @@ -916,7 +912,7 @@ pl: invalid_invite: "Podane łącze do zaproszenia jest nieważne!" new: email: "E-mail" - enter_email: "Wpisz adres e-mail" + enter_email: "Wpisz Twój adres e-mail" enter_password: "Podaj hasło (maks. 6 znaków)" enter_password_again: "Wprowadź ponownie to samo hasło" enter_username: "Wybierz nazwę użytkownika (możliwe litery, cyfry i podkreślniki)" @@ -968,8 +964,8 @@ pl: no_services_available: "Ten pod nie udostępnia żadnych usług." not_logged_in: "Nie zalogowany." really_disconnect: "Odłączyć %{service}?" - services_explanation: "Podłączenie usług umożliwia jednoczesne publikowanie w nich wpisów, które udostępniasz w sieci Diaspora*." - title: "Zarządzaj podłączonymi usługami" + services_explanation: "Połączenie usług umożliwia jednoczesne publikowanie w nich wpisów, które udostępniasz na diasporze*." + title: "Zarządzaj połączonymi usługami" provider: facebook: "Facebook" tumblr: "Tumblr" @@ -987,7 +983,7 @@ pl: other: "W %{count} aspektach" zero: "Dodaj kontakt" invitations: - by_email: "Przez e-mail" + by_email: "Zaproś ludzi przez e-mail" invite_your_friends: "Zaproś swoich znajomych" invites: "Zaproszenia" share_this: "Udostępnij to łącze przez e-mail, na blogu lub w sieci społecznościowej!" @@ -996,11 +992,11 @@ pl: control_your_audience: "Dostosuj swoją publiczność" logged_in: "Zalogowano do %{service}" manage: "Zarządzaj powiązanymi usługami" - new_user_welcome_message: "Używaj #znaczników, aby opisywać swoje wpisy i znajdować osoby o podobnych zainteresowaniach. Zawołaj ciekawych ludzi dzięki @wzmiankom" + new_user_welcome_message: "Używaj #tagów, aby opisywać swoje wpisy i znajdować osoby o podobnych zainteresowaniach. Zawołaj ciekawych ludzi dzięki @wzmiankom" outside: "Wiadomości publiczne będą widoczne także dla użytkowników spoza diaspory*." share: "Podziel się" title: "Konfiguracja połączonych usług" - visibility_dropdown: "Użyj tej listy rozwijalnej, aby zmienić widoczność swojego wpisu. (Proponujemy, aby ten pierwszy był publiczny.)" + visibility_dropdown: "Użyj tej listy rozwijalnej, aby zmienić widoczność swojego wpisu. (Proponujemy, aby ten pierwszy był publiczny.)" publisher: discard_post: "Porzuć wpis" formatWithMarkdown: "Możesz użyć %{markdown_link} aby sformatować swój wpis" @@ -1030,7 +1026,7 @@ pl: active_users_halfyear: "Aktywni użytkownicy w półroczu" active_users_monthly: "Aktywni użytkownicy miesięcznie" closed: "Zamknięte" - disabled: "Nie dostępne" + disabled: "Niedostępne" enabled: "Dostępne" local_comments: "Lokalne komentarze" local_posts: "Lokalne wpisy" @@ -1063,11 +1059,11 @@ pl: title: "Skomentowane wpisy" community_spotlight_stream: "W centrum uwagi społeczności" followed_tag: - add_a_tag: "Dodaj znacznik" - all: "Wszystkie znaczniki" + add_a_tag: "Dodaj tag" + all: "Wszystkie tagi" follow: "Obserwuj" - title: "#Obserwowane znaczniki" - followed_tags_stream: "#Obserwowane znaczniki" + title: "#Obserwowane tagi" + followed_tags_stream: "#Obserwowane tagi" like_stream: title: "Strumień polubionych" liked: @@ -1089,7 +1085,7 @@ pl: name_too_long: "Proszę skróć nazwę taga do mniej niż %{count} znaków. Obecnie zawiera %{current_length} znaków." show: follow: "Obserwuj #%{tag}" - none: "Pusty znacznik nie istnieje!" + none: "Pusty tag nie istnieje!" stop_following: "Przestań obserwować #%{tag}" tagged_people: few: "%{count} osoby otagowane %{tag}" @@ -1109,7 +1105,7 @@ pl: edit: also_commented: "...ktoś skomentuje wpis mający mój komentarz" auto_follow_aspect: "Aspekt dla automatycznie dodanych użytkowników:" - auto_follow_back: "Automatycznie zacznij udostępniać gdy ktoś zaczyna udostępniać mnie" + auto_follow_back: "Automatycznie zacznij udostępniać gdy ktoś zaczyna mi udostępniać" change: "Zmień" change_color_theme: "Zmień wariant kolorystyczny" change_email: "Zmiana adresu e-mail" @@ -1149,20 +1145,20 @@ pl: request_export_update: "Odśwież dane mojego profilu" reshared: "...ktoś przekazał dalej mój wpis" show_community_spotlight: "Wyświetlić wyróżnionych użytkowników w Strumieniu?" - show_getting_started: "Ponownie włącz - Pierwsze kroki" + show_getting_started: "Ponownie włącz \"pierwsze kroki\"" someone_reported: "ktoś wysłał zgłoszenie" started_sharing: "...ktoś zaczął mi udostępniać wpisy" stream_preferences: "Ustawienia Strumienia" your_email: "Adres e-mail" your_email_private: "Twój email zawsze pozostanie niewidoczny dla innych użytkowników" - your_handle: "Twój Identyfikator Diaspory" + your_handle: "Twój identyfikator w diasporze*" getting_started: awesome_take_me_to_diaspora: "Świetnie! Zabierz mnie na diasporę*" community_welcome: "Społeczność diaspory* cieszy się, że jesteś z nami!" connect_to_facebook: "Możemy nieco przyśpieszyć poprzez %{link} do diaspory*. To spowoduje pobranie Twojej nazwy, zdjęcia i włączy równoczesne publikowanie wpisów w obu serwisach." connect_to_facebook_link: "Podpięcie konta na Facebooku" - hashtag_explanation: "Znaczniki pozwalają łatwo odnaleźć interesujące Cię tematy. Są także świetnym sposobem na nawiązywanie znajomości na diasporze*." - hashtag_suggestions: "Spróbuj obserwować znaczniki takie jak #sztuka, #filmy, #gif, itd." + hashtag_explanation: "Tagi pozwalają łatwo odnaleźć interesujące Cię tematy. Są także świetnym sposobem na nawiązywanie znajomości na diasporze*." + hashtag_suggestions: "Spróbuj obserwować tagi takie jak #sztuka, #filmy, #gif, itd." well_hello_there: "No, witam!" what_are_you_in_to: "Czym się interesujesz?" who_are_you: "Kim jesteś?" diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml index 947eb9e68..4a8032ead 100644 --- a/config/locales/diaspora/pt-BR.yml +++ b/config/locales/diaspora/pt-BR.yml @@ -274,6 +274,13 @@ pt-BR: heading: "Favoritos" post_something: "Publicar em diaspora*" cancel: "Cancelar" + color_themes: + dark: "Escuro" + dark_green: "Verde-escuro" + egyptian_blue: "Azul egípcio" + magenta: "Magenta" + original: "Cinza original" + original_white: "Fundo branco original" comments: create: error: "Falha ao comentar." @@ -349,7 +356,7 @@ pt-BR: data_visible_to_podmin_q: "Quanta informação minha quem administra meu servidor pode ver?" download_data_a: "Sim. Na aba Conta da sua página de configurações, role para baixo. Você encontrará dois botões: um para baixar seus dados e outro para baixar suas fotos." download_data_q: "Posso baixar uma cópia de todos os meus dados contidos em minha semente (conta)?" - move_pods_a: "No futuro você será capaz de exportar sua conta de um servidor e importá-la para outro, mas no momento isto não é possível. Você sempre poderá abrir uma nova conta e adicionar seus contactos aos aspectos nessa nova conta, e pedir-lhes para adicionar a sua nova conta aos aspectos deles." + move_pods_a: "A versão 0.7.0.0 da diaspora* disponibiliza a primeira etapa de migração de conta: agora, você pode exportar todos os dados da seção \"Conta\" das suas configurações de usuário. Guarde seus dados em segurança! Um próximo lançamento possibilitará a migração da conta inteira, inclusive publicações e contatos, para outro pod." move_pods_q: "Como eu movo minha semente (conta) de um servidor para outro?" title: "Gerenciamento de conta e de dados" aspects: @@ -357,7 +364,7 @@ pt-BR: change_aspect_of_post_q: "Uma vez que eu publiquei alguma coisa, posso mudar o(s) aspecto(s) que pode(m) ver isto?" contacts_know_aspect_a: "Não. Eles não podem ver o nome do aspecto em nenhuma circunstância." contacts_know_aspect_q: "Meus contactos sabem em que aspectos eu os coloquei?" - contacts_visible_a: "Se você marcar esta opção, então os contatos incluídos no aspecto vão poder ver uns aos outros na sua página de perfil, na aba \"Contatos\". É melhor marcar esta opção somente se todos os contatos no aspecto se conhecerem – por exemplo, se o aspecto reunir as pessoas de um clube ou sociedade à qual você pertence. O nome do aspecto vai continuar invisível para eles." + contacts_visible_a: "Se você marcar esta opção, os contatos incluídos no aspecto vão poder ver uns aos outros na sua página de perfil, na aba \"Contatos\". (No momento, a aba \"Contatos\" está visível apenas para os contatos que estão no mesmo pod que você.) É melhor marcar esta opção somente se todos os contatos no aspecto se conhecerem – por exemplo, se o aspecto tiver sido criado para reunir membros de um clube ou sociedade à qual você pertence. O nome do aspecto vai continuar invisível para eles." contacts_visible_q: "O que significa \"tornar contatos desse aspecto visíveis entre si\"?" delete_aspect_a: "Na página inicial, clique em \"Meus aspectos\", na barra lateral, e clique no ícone de lápis ao lado do aspecto indesejado, ou abra a página dos seus contatos e selecione o aspecto. Aí, clique no ícone de lixeira no canto superior direito da página." delete_aspect_q: "Como eu apago um aspecto?" @@ -384,6 +391,7 @@ pt-BR: faq: "FAQ" foundation_website: "site da Fundação Diaspora" getting_help: + get_support_a_discourse: "Busque discussões existentes relacionadas à sua dúvida ou abra um novo tópico na nossa plataforma %{discourse}" get_support_a_faq: "Leia nossa %{faq} na wiki" get_support_a_hashtag: "Peça ajuda à comunidade: publique sua pergunta com a hashtag %{question}" get_support_a_irc: "Junte-se a nós no %{irc} (chat ao vivo)" @@ -413,7 +421,6 @@ pt-BR: mentions: how_to_mention_a: "Digite o símbolo \"@\" e comece a escrever o nome da pessoa. Um menu suspenso deve aparecer para facilitar a seleção. Repare que só é possível mencionar pessoas adicionadas a algum aspecto seu." how_to_mention_q: "Como eu menciono alguém quando estou fazendo uma pubicação?" - mention_in_comment_a: "Não, atualmente não." mention_in_comment_q: "Posso mencionar alguém em um comentário?" see_mentions_a: "Sim. Clique em \"@Menções\" na sua página inicial, na coluna à esquerda." see_mentions_q: "Existe uma maneira de ver as publicações nas quais eu tenha sido mencionado?" @@ -434,7 +441,7 @@ pt-BR: find_people_a: "Se quiser convidar seus amigos para a diaspora*, use o link de convite ou o link de e-mail na barra lateral. Siga #tags para descobrir pessoas que compartilhem de seus interesses e adicione a algum aspecto aquelas que chamarem a sua atenção. Conte para todo mundo que você é #novata ou #novato em um post público." find_people_q: "Eu acabei de me associar ao pod, como eu posso encontrar pessoas com quem eu possa compartilhar?" title: "Pods" - use_search_box_a: "Se você sabe a diaspora* ID completa dessas pessoas (nomedeusuario@nomedopod.org, p. ex.), você pode encontrá-las buscando diretamente pelas IDs. Se vocês estão no mesmo servidor, basta buscar pelo nome de usuário. Uma alternativa é buscar pelo nome de perfil (o que aparece na tela). Se uma busca não funcionar da primeira vez, tente novamente." + use_search_box_a: "Você pode encontrar pessoas buscando o nome de usuário ou de exibição (que é mostrado no perfil). Se não der certo, busque a diaspora* ID completa (nomedeusuario@nomedopod.org). Uma pesquisa pode não retornar resultados de primeira por causa de um atraso na rede. Tente novamente." use_search_box_q: "Como eu utilizo a caixa de busca para encontrar pessoas em particular?" what_is_a_pod_a: "Um pod é um servidor executando o software diaspora* e conectado à rede diaspora*. \"Pod\", inglês para \"vagem\", é uma metáfora das vagens que contêm as sementes das plantas, da mesma maneira que um servidor contém contas de usuários. Existem diversos pods. Você pode adicionar amigos de outros servidores e se comunicar com eles. Não é preciso abrir conta em mais de um – nesse sentido, um pod se parece com um provedor de e-mails. Há servidores públicos, privados e, com um pouco de esforço, você pode até abrir o seu próprio pod." what_is_a_pod_q: "O que é um pod?" @@ -445,15 +452,12 @@ pt-BR: character_limit_q: "Qual é o limite de caracteres para publicações?" embed_multimedia_a: "Geralmente, basta colar a URL (ex. http://www.youtube.com/watch?v=nnnnnnnnn) na publicação que o vídeo ou áudio será incorporado automaticamente, usando oEmbed. São compatíveis YouTube, Vimeo, SoundCloud e Flickr, entre outros; novos sites estão sempre sendo acrescentados à lista. Lembre-se de sempre publicar links simples e completos – nada de links encurtados ou caracteres depois da URL base – e esperar um pouco antes de atualizar a página depois de publicar para pré-visualizar." embed_multimedia_q: "Como eu posso incorporar um vídeo, áudio, ou outro conteúdo multimídia em uma publicação?" - format_text_a: "Utilizando um sistema simplificado chamado %{markdown}. Você pode encontrar a sintaxe completa %{here}. O botão de pré-visualização é muito útil aqui, pois você pode ver como sua mensagem parecerá antes de compartilhá-la." + format_text_a: "A diaspora* usa um sistema simplificado chamado %{markdown}. O editor tem botões para facilitar a formatação do texto. Se quiser formatar sua publicação manualmente, consulte a sintaxe do Markdown completa %{here}. A aba de pré-visualização serve para ver como um post vai ficar antes de compartilhá-lo. Lembre-se que você não poderá editá-lo depois de publicar, então use a pré-visualização para ter certeza de que está perfeito antes de clicar em Compartilhar!" format_text_q: "Como eu posso formatar o texto em minhas publicações (negrito, itálico, etc.)?" hide_posts_a: "Se você apontar seu mouse para a parte superior da publicação, um X aparece à direita. Clique nele para ocultar a publicação e desligar as notificações sobre esta publicação. Você ainda pode ver a publicação se você visitar a página de perfil da pessoa que publicou." hide_posts_q: "Como faço para ocultar uma publicação?" - image_text: "texto da imagem" - image_url: "URL da imagem" insert_images_a: "Clique no pequeno ícone de câmera para inserir uma imagem na publicação. Pressione o ícone novamente para adicionar outra foto. Você também pode selecionar múltiplas fotos para carregá-las de uma vez só." - insert_images_comments_a1: "Não é possível fazer upload de imagens para comentários, mas o seguinte código Markdown" - insert_images_comments_a2: "pode ser usado para inserir imagens da web aos comentários assim como às publicações." + insert_images_comments_a: "Você pode usar Markdown para inserir imagens da web em comentários da mesma forma que em publicações, mas não carregar imagens armazenadas no seu computador diretamente para um comentário. Primeiro faça upload do arquivo para um serviço de hospedagem de imagens e depois insira-o usando o botão de imagem que fica sobre o editor." insert_images_comments_q: "Posso inserir imagens em comentários?" insert_images_q: "Como eu insiro imagens às publicações?" post_location_a: "Clique no ícone de pino ao lado da câmera na caixa de texto. Sua localização será extraída do OpenStreetMap. Você pode editá-la – é possível informar apenas a cidade onde você está, sem o nome da rua." @@ -482,14 +486,10 @@ pt-BR: title: "Publicações de acesso privado" who_sees_post_a: "Somente os usuários da diaspora* logados e colocados por você nesse aspecto antes da publicação privada ser feita podem vê-la." who_sees_post_q: "Quando eu publico uma mensagem em um aspecto (por ex., uma publicação privada), quem pode vê-la?" - private_profiles: - title: "Perfis privados" - whats_in_profile_a: "Seu perfil privado contém informações como biografia, localização, sexo e data de nascimento. Todas são opcionais – você decide se vai fornecê-las ou não. Apenas pessoas autenticadas com quem você compartilha podem ver seu perfil privado, bem como as publicações privadas destinadas aos aspectos aos quais pertencem. As publicações privadas aparecem para elas na sua página de perfil, misturadas às públicas." - whats_in_profile_q: "O que faz parte do meu perfil privado?" - who_sees_profile_a: "Qualquer usuário logado com quem você esteja compartilhando (significa que você os adicionou a um de seus aspectos). De qualquer modo, pessoas seguem você, mas aqueles que você não segue, somente verão sua informação pública." - who_sees_profile_q: "Quem vê meu perfil privado?" - who_sees_updates_a: "Qualquer pessoa nos seus aspectos vê mudanças no seu perfil privado. " - who_sees_updates_q: "Quem vê atualizações do meu perfil privado?" + profile: + title: "Perfil" + whats_in_profile_q: "O que aparece no meu perfil?" + who_sees_profile_q: "Quem vê meu perfil?" public_posts: can_comment_reshare_like_a: "Qualquer usuário logado em diaspora* pode comentar, recompartilhar, ou curtir sua publicação pública." can_comment_reshare_like_q: "Quem pode comentar, recompartilhar, ou curtir minha publicação no modo público?" @@ -502,16 +502,6 @@ pt-BR: title: "Publicações de acesso público" who_sees_post_a: "Qualquer internauta pode ver uma publicação marcada como pública, então tenha certeza antes de enviá-la. Lembre-se: essa é uma ótima maneira de compartilhar suas ideias com o mundo." who_sees_post_q: "Quando eu publico alguma coisa no modo público, quem pode ver?" - public_profiles: - title: "Perfis públicos" - what_do_tags_do_a: "Elas ajudam pessoas a conhecer você. Sua foto de perfil aparecerá do lado esquerdo das páginas de tags particulares, junto com alguém mais que tenha essas tags em seus perfis públicos." - what_do_tags_do_q: "Para que servem as tags no meu perfil público?" - whats_in_profile_a: "O seu perfil público tem seu nome, as cinco tags que você escolheu para se descrever e a sua foto, se esses campos tiverem sido preenchidos. Todas essas informações são opcionais – você decide dá-las ou não. Você pode tornar suas informações de perfil identificáveis ou anônimas, como preferir. A sua página de perfil também mostra todas as publicações públicas feitas por você." - whats_in_profile_q: "O que faz parte do meu perfil público?" - who_sees_profile_a: "Qualquer usuário logado em diaspora*, assim como toda a internet, podem vê-lo. Cada perfil tem um URL direto, então ele pode ter uma ligação direta a partir de sites externos. O perfil público pode ser indexado por mecanismos de busca." - who_sees_profile_q: "Quem vê o meu perfil público?" - who_sees_updates_a: "Quaisquer pessoas podem ver mudanças se elas visitam sua página de perfil." - who_sees_updates_q: "Quem vê atualizações do meu perfil público?" resharing_posts: reshare_private_post_aspects_a: "Não, não é possível recompartilhar uma publicação privada. A razão é o respeito pelas intenções do publicador original, que compartilhou a publicação apenas com um grupo particular de pessoas." reshare_private_post_aspects_q: "Posso recompartilhar uma publicação privada somente com certos aspectos?" @@ -662,7 +652,8 @@ pt-BR: mark_all_shown_as_read: "marcar tudo como lido" mark_read: "Marcar como lido" mark_unread: "Marcar como não lida" - mentioned: "Mencionados" + mentioned: "Mencionados na publicação" + mentioned_in_comment: "Mencionados no comentário" no_notifications: "Você ainda não tem notificações." notifications: "Notificações" reshared: "Recompartilhou" @@ -683,6 +674,12 @@ pt-BR: mentioned_deleted: one: "%{actors} mencionou você em uma publicação deletada." other: "%{actors} mencionaram você em uma publicação deletada." + mentioned_in_comment: + one: "%{actors} mencionou você em um comentárioà publicação %{post_link}." + other: "%{actors} mencionaram você em um comentárioà publicação %{post_link}." + mentioned_in_comment_deleted: + one: "%{actors} mencionou você em um comentário deletado." + other: "%{actors} mencionaram você em um comentário deletado." private_message: one: "%{actors} te enviou uma mensagem." other: "%{actors} te enviaram uma mensagem." @@ -779,7 +776,7 @@ pt-BR: message: |- Oi, tudo bem? - %{diaspora_id} convidou você para se juntar à diaspora*! + %{user} convidou você para se juntar à diaspora*! Clique neste link para começar: @@ -804,6 +801,9 @@ pt-BR: mentioned: limited_post: "Você foi mencionado em uma publicação privada." subject: "%{name} mencionou você em Diaspora*" + mentioned_in_comment: + limited_post: "Mencionaram você em um comentário a uma publicação limitada." + reply: "Responder ou ver esta conversa >" private_message: reply_to_or_view: "Responder ou visualizar esta conversa >" subject: "Há uma nova mensagem privada para você" @@ -1169,6 +1169,7 @@ pt-BR: last_exported_at: "(Atualizado pela última vez às %{timestamp})" liked: "alguém curtir uma publicação sua" mentioned: "mencionarem você em uma publicação" + mentioned_in_comment: "mencionaram você em um comentário" new_password: "Nova senha" private_message: "você receber uma mensagem privada" receive_email_notifications: "Receber notificações por email quando:" diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index 3a37506f6..1a9e0217c 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -268,7 +268,6 @@ pt-PT: mentions: how_to_mention_a: "Insira o sinal \"@\" e comece a digitar o seu nome. Deverá aparecer uma lista de comandos para o deixar selecioná-los mais facilmente. Note que só é possível mencionar pessoas que adicionou num aspeto." how_to_mention_q: "Como é que menciono alguém quando coloco uma publicação?" - mention_in_comment_a: "Atualmente, não." mention_in_comment_q: "Posso mencionar alguém num comentário?" see_mentions_a: "Sim, clique em \"Menções\" na coluna à esquerda na sua página inicial." see_mentions_q: "Existe alguma maneira para ver as publicações nas quais eu tenha sido mencionado?" @@ -296,11 +295,7 @@ pt-PT: format_text_q: "Como é que eu formato o texto nas minhas publicações (negrito, itálico, etc.)?" hide_posts_a: "Se apontar o seu rato no topo de uma publicação, aparece um X à direita. Clique-o para ocultar a publicação e cancelar as notificações sobre a mesma. Ainda pode continuar a ver a publicação se visitar a página de perfil da pessoas que a publicou." hide_posts_q: "Como é que eu oculto uma publicação? Como é que eu deixo de receber notificações sobre uma publicação com o meu comentário?" - image_text: "texto da imagem" - image_url: "url da imagem" insert_images_a: "Clique no ícone da câmara para inserir uma imagem numa publicação. Clique novamente no ícone da fotografia para adicionar outra fotografia, ou pode selecionar múltiplas fotografias para as enviar de uma vez." - insert_images_comments_a1: "O código seguinte \"Mardown\"" - insert_images_comments_a2: "pode ser utilizado para inserir imagens da web para os comentários, bem como, nas publicações." insert_images_comments_q: "Eu posso inserir imagens nos comentários?" insert_images_q: "Como é que eu insiro imagens nas publicações?" size_of_images_a: "Não. As imagens são redimensionadas automaticamente para se ajustarem ao fluxo. A redução não tem um código para especificar o tamanho de uma imagem." @@ -321,14 +316,6 @@ pt-PT: title: "Publicações Privadas" who_sees_post_a: "Apenas os utilizadores logados em diaspora* que associou a esse grupo podem ver a sua publicação privada." who_sees_post_q: "Quando eu publico uma mensagem num aspeto (ex.:, uma publicação privada), quem a pode ver?" - private_profiles: - title: "Perfis Privados" - whats_in_profile_a: "Biografia, localização, sexo, e data de nascimento. É o que aparece na parte de baixo da página de edição do perfil. Toda esta informação é opcional - depende de você preencher ou não. Os utilizadores logados que você tenha adicionado aos seus grupos são as únicas pessoas que podem ver o seu perfil privado. Eles também verão as publicações privadas feitas no(s) grupos(s) em que os colocou, misturadas com as publicações públicas feitas por si, quando visitarem a sua página de perfil." - whats_in_profile_q: "O que faz parte do meu perfil privado?" - who_sees_profile_a: "Qualquer utilizador logado com quem você esteja a compartilhar (significa que você os adicionou a um dos seus grupos). De qualquer forma, as pessoas que o seguem mas que você não segue, verão apenas a sua informação pública." - who_sees_profile_q: "Quem vê o meu perfil privado?" - who_sees_updates_a: "Qualquer pessoa nos seus aspetos, vê as alterações do seu perfil privado. " - who_sees_updates_q: "Quem vê as atualizações ao meu perfil privado?" public_posts: can_comment_reshare_like_a: "Qualquer utilizador do diaspora* com sessão iniciada, pode comentar, compartilhar ou gostar de uma publicação pública." can_comment_reshare_like_q: "Quem pode comentar, recompartilhar, ou gostar na minha publicação pública?" @@ -339,12 +326,6 @@ pt-PT: title: "Publicações Públicas" who_sees_post_a: "Qualquer pessoa que utilize a internet pode potencialmente ver uma publicação marcada por si como pública, por isso assegure-se de que realmente quer que ela seja pública. É uma ótima forma de apelar ao mundo lá fora." who_sees_post_q: "Quando eu publico qualquer coisa publicamente, quem é que pode ver?" - public_profiles: - title: "Perfis públicos" - whats_in_profile_q: "O que está no meu perfil público" - who_sees_profile_q: "Quem vê o meu perfil público?" - who_sees_updates_a: "Qualquer pessoa pode ver alterações, se visitarem a página do seu perfil." - who_sees_updates_q: "Quem vê as atualizações ao meu perfil público?" resharing_posts: reshare_private_post_aspects_q: "Eu posso voltar a compartilhar uma publicação privada só com alguns aspetos?" reshare_public_post_aspects_q: "Eu posso voltar a compartilhar uma publicação pública só com alguns aspetos?" diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index 0306aafa0..3d303f989 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -366,7 +366,6 @@ ru: mentions: how_to_mention_a: "Напишите знак \"@\" и начните набирать имя. Появится меню с выбором подходящих пользователей. Заметьте, что упоминать пользователя можно только, если вы добавили его в свои аспекты." how_to_mention_q: "Как мне упомянуть кого-нибудь, когда я создаю запись?" - mention_in_comment_a: "Пока нет." mention_in_comment_q: "Могу ли я упомянуть кого-нибудь в комментарии?" see_mentions_a: "Да. Нажмите кнопку \"@Упоминания\" в боковой колонке на вашей странице." see_mentions_q: "Есть ли способ увидеть список записей, в которых я упомянут?" @@ -402,11 +401,7 @@ ru: format_text_q: "Как мне оформить текст моих записей (полужирный, курсив и т.д.)?" hide_posts_a: "Если вы наведёте мышью на запись, справа вверху появится крестик. Нажмите на него. Вы всё равно сможете видеть запись и комментарии, если зайдёте на страницу к автору этой записи." hide_posts_q: "Как мне скрыть запись и перестать получать уведомления о комментариях к ней?" - image_text: "всплывающий текст" - image_url: "Адрес изображения" insert_images_a: "Нажмите пиктограмму фотокамеры и укажите нужное изображение для загрузки с вашего компьютера. Если же вы хотите вставить изображение из интернета, вы можете воспользоваться синтаксисом Мarkdown." - insert_images_comments_a1: "Следующий код Markdown" - insert_images_comments_a2: "может быть использован как для комментариев, так и для записей." insert_images_comments_q: "Могу ли я добавить изображения в комментарии?" insert_images_q: "Как мне добавить в запись изображение?" post_location_a: "Нажмите на значёк-булавку, рядом с камерой в форме оформления записи. Это добавит ваше местоположение согласно OpenStreetMap. Вы можете подправить получившийся адрес, например оставить только город, без указания улицы." @@ -435,14 +430,6 @@ ru: title: "Приватные записи" who_sees_post_a: "Только залогиненные пользователи диаспоры*, которые были добавлены в данный аспект." who_sees_post_q: "Когда я создаю запись для аспекта (т.н. приватная запись), кто её сможет видеть?" - private_profiles: - title: "Приватные профили" - whats_in_profile_a: "Биографию, местоположение, пол и день рождения. Если, конечно, вы указали эту информацию в настройках своего профиля. Страницу увидят только пользователи, которых вы добавили в свои аспекты, которые также увидят в ленте помимо публичных записей, те приватные записи, которыми вы поделились с этими аспектами." - whats_in_profile_q: "Что содержит страница приватного профиля?" - who_sees_profile_a: "Любой залогиненный пользователь диаспоры, которого вы добавили в свои аспекты. Тем не менее, люди, которые добавили вас, но которых не добавили вы будут видеть только публичную информацию." - who_sees_profile_q: "Кто может видеть мой приватный профиль?" - who_sees_updates_a: "Любой пользователь из ваших аспектов. " - who_sees_updates_q: "Кто увидит обновления в моём приватном профиле?" public_posts: can_comment_reshare_like_a: "Любой зарегистрированный пользователь диаспоры." can_comment_reshare_like_q: "Кто может комментировать мои публичные записи, делиться или отмечать как понравившиеся?" @@ -455,16 +442,6 @@ ru: title: "Публичные записи" who_sees_post_a: "Все интернет пользователи могут увидеть запись, которую вы сделали публичной. Так что проверьте - действительно ли вы хотите этого. С другой стороны, это неплохой способ поделиться со всем миром." who_sees_post_q: "Кто может видеть мои публичные записи?" - public_profiles: - title: "Публичные профили" - what_do_tags_do_a: "Они помогают людям понять чем вы интересуетесь. Ваша фотография и имя появятся на странице метки слева в списке среди других людей, использовавших эту метку в их публичных профилях." - what_do_tags_do_q: "Для чего нужны метки в моём публичном профиле?" - whats_in_profile_a: "Ваше имя, пять меток, которые вы выбрали, чтобы описать себя, аватара и лента ваших публичных записей. Вы можете сделать эту информацию настолько личной или настолько анонимной, насколько захотите." - whats_in_profile_q: "Что содержит страница публичного профиля?" - who_sees_profile_a: "Любой пользователь сети Internet. Для каждого профиля есть прямая ссылка, которую можно указывать на внешних сайтах. Также публичные профили индексируются поисковыми системами." - who_sees_profile_q: "Кто может увидеть мой публичный профиль?" - who_sees_updates_a: "Любой пользователь сети Internet, посещающий вашу страницу." - who_sees_updates_q: "Кто видит обновления в моём публичном профиле?" resharing_posts: reshare_private_post_aspects_a: "Нет. Эта функция отсутствует из уважения к желаниям автора записи, который поделился ей только с ограниченным кругом людей." reshare_private_post_aspects_q: "Могу ли я поделиться приватной записью?" diff --git a/config/locales/diaspora/sc.yml b/config/locales/diaspora/sc.yml index 16a0998b2..cdafc3c40 100644 --- a/config/locales/diaspora/sc.yml +++ b/config/locales/diaspora/sc.yml @@ -7,6 +7,7 @@ sc: _applications: "Aplicatziones" _contacts: "Cuntatos" + _help: "Agiudu" _services: "Servìtzios" account: "Contu" activerecord: @@ -20,6 +21,14 @@ sc: attributes: diaspora_handle: taken: "est giai istadu pigadu." + poll: + attributes: + poll_answers: + not_enough_poll_answers: "Non bi sunt optziones bastantes pro su sondàgiu." + poll_participation: + attributes: + poll: + already_participated: "As giai leadu parte a custu sondàgiu!" reshare: attributes: root_guid: @@ -33,6 +42,62 @@ sc: username: invalid: "no est bàlidu. Est possìbile impreare petzi lìteras, nùmeros, e underscores." taken: "est giai istadu pigadu." + admins: + admin_bar: + pages: "Pàginas" + pod_stats: "Istatìsticas de su pod" + report: "Sinnalatziones" + sidekiq_monitor: "Monitor Sidekiq" + user_search: "Chirca impreadore" + weekly_user_stats: "Istatìsticas de sa chida pro s'impreadore" + stats: + 2weeks: "2 chidas" + 50_most: "Sas 50 etichetas prus popolares" + comments: + one: "%{count} cummentu" + other: "%{count} cummentos" + zero: "%{count} cummentos" + current_segment: "S'intervallu atuale tenet una mèdia de %{post_yest} publicatziones pro impreadore, dae su %{post_day}" + daily: "Cada die" + display_results: "Ammustrende sos risultados pro s'intervallu %{segment}" + go: "Bae" + month: "Mese" + posts: + one: "%{count} publicatzione" + other: "%{count} publicatziones" + zero: "%{count} publicatziones" + shares: + one: "%{count} cumpartzidura" + other: "%{count} cumpartziduras" + zero: "%{count} cumpartziduras" + tag_name: "Nùmene eticheta: %{name_tag} Impreada: %{count_tag} bortas" + usage_statistic: "Istatìsticas de impreu" + users: + one: "%{count} impreadore" + other: "%{count} impreadores" + zero: "%{count} impreadores" + week: "Chida" + user_search: + add_invites: "Annaghe invitos" + are_you_sure: "Seguru ses de chèrrere serrare su contu?" + close_account: "Serra su contu" + email_to: "Indiritzos de p. eletrònica a ue imbiare sos invitos" + under_13: "Ammustra sos impreadores chi tenent de mancu de 13 annos (Children's Online Privacy Protection Act)" + users: + one: "%{count} impreadore agatadu" + other: "%{count} impreadores agatados" + zero: "%{count} impreadores agatados" + view_profile: "Abbista profilu" + you_currently: + one: "In custu momentu tenes un'invitu disponìbile %{link}" + other: "In custu momentu tenes %{count} invitos disponìbiles %{link}" + zero: "In custu momentu non tenes prus invitos disponìbiles %{link}" + weekly_user_stats: + amount_of: + one: "Nùmeru de impreadores noos custa chida: %{count}" + other: "Nùmeru de impreadores noos custa chida: %{count}" + zero: "Nùmeru de impreadores noos custa chida: nissunu" + current_server: "Sa data atuale de su server est %{date}" all_aspects: "Totu sas caras" are_you_sure: "Seguru ses?" are_you_sure_delete_account: "Seguru ses de bòlere serrare su contu tuo? Custu non podet èssere annuddadu!" @@ -48,6 +113,7 @@ sc: aspect_listings: add_an_aspect: "+ Annanghe una cara" aspect_stream: + make_something: "Crea carchi cosa" stay_updated: "Abarra agiornadu" stay_updated_explanation: "In su flussu tuo bi sunt totu sos cuntatos tuos, sas etichetas chi sighis e sas publicatziones de sos membros prus creativos de sa comunidade." destroy: @@ -64,17 +130,23 @@ sc: donate: "Dona" donate_liberapay: "Agiuda a liberapay" help: + any_problem: "Tenes unu problema?" + contact_podmin: "Cuntata s'amministradore de su pod tuo!" do_you: "Boles..." feature_suggestion: "propònnere una %{link}?" find_a_bug: "sinnalare un'%{link}?" have_a_question: "fàghere una %{link}?" here_to_help: "Sa comunidade de diaspora* est inoghe!" + mail_podmin: "Indiritzu de su podmin" need_help: "Tenes bisòngiu de agiudu?" support_forum_link: "forum de suportu" tag_bug: "errore" tag_feature: "funtzionalidade" tag_question: "pregunta" - introduce_yourself: "Custu est su flussu tuo. Brinca in intro e presenta·ti." + tutorial_link_text: "Ghias" + tutorials_and_wiki: "%{faq}, %{tutorial} e %{wiki}: un'agiudu pro sos primos passos tuos" + introduce_yourself: "Custu est su flussu tuo. Brinca a intro e presenta·ti." + keep_pod_running: "Mantènne %{pod} lestru e agiuda a comporare servers cun una donatzione mensile!" new_here: follow: "Sighi %{link} e saluda sos impitadores noos de diaspora*!" learn_more: "Àteras informatziones" @@ -86,7 +158,7 @@ sc: no_contacts_message: community_spotlight: "Prus de importu in sa comunidade" or_spotlight: "O podes cumpartzire cun %{link}" - try_adding_some_more_contacts: "Podes chircare o invitare àteros cuntatos." + try_adding_some_more_contacts: "Podes chircare o %{invite_link} àteros cuntatos." you_should_add_some_more_contacts: "Dias dèpere annànghere carchi cuntatu in prus!" seed: acquaintances: "Connoschentes" @@ -96,6 +168,13 @@ sc: update: failure: "Sa cara tua, %{name}, tenet unu nùmene tropu longu pro èssere sarbada." success: "Sa cara tua, %{name}, est istada modificada." + blocks: + create: + failure: "Non potzo ignorare cussu impreadore. #evasione" + success: "AB, no as prus a bìdere cussu impreadore in su flussu tuo. #mudu!" + destroy: + failure: "Non potzo acabare de ignorare cussu impreadore. #evasione" + success: "Bidimus ite tenent de nàrrere! #narasalude" bookmarklet: explanation: "Pùblica in diaspora* dae totue annanghende %{link} a sos preferidos tuos." post_something: "Pùblica in diaspora*" @@ -116,18 +195,23 @@ sc: title: "Cuntatos" spotlight: community_spotlight: "In evidèntzia in sa comunidade" + suggest_member: "Cussìgia unu membru" conversations: create: fail: "Messàgiu non vàlidu" sent: "Messàgiu imbiadu" index: + conversations_inbox: "Arresonos – Càscia de sas lìteras" inbox: "Casella de posta" + new_conversation: "Arresonu nou" no_messages: "Perunu messàgiu" new: send: "Imbia" sending: "Imbiende..." subject: "Sugetu" to: "A" + new_conversation: + fail: "Messàgiu non vàlidu" show: delete: "Iscantzella s'arresonu" reply: "Risponde" @@ -144,20 +228,200 @@ sc: correct_the_following_errors_and_try_again: "Currege custos errore e torra a proare." fill_me_out: "Iscrie inoghe" find_people: "Agata pessonas o #etichetas" + help: + account_and_data_management: + close_account_a: "Bae a su fundu de sa pàgina de sas impostatziones tuas e incarca su butone \"Iscantzella su contu\". T'at a èssere pedidu de insertare sa crae de intrada tua pro acabare su protzessu. Ammenta·ti chi, si as a iscantzellare su contu tuo, non t'as a pòdere mai prus torrare a registrare cun su matèssi nùmene in cussu pod." + close_account_q: "Comente potzo iscantzellare su contu meu?" + data_other_podmins_a: "Cando incumintzas a cumpartzire cun calicunu in un'àteru pod totu sas publicatziones chi cumpartzis cun issos e una còpia de sos datos de su profilu tuo benit sarvada (in sa cache) in sos pods issoro. Cando iscantzellas una publicatzione o sos datos de su profilu benint iscantzellados dae unu pod una rechesta est imbia a sos àteros pods in ue bi sunt còpias sarvadas. Sas immàgines tuas non sunt mai sarvadas in pods chi non siat su tuo; petzi ligàmenes a sas immàgines benint imbiados a sos àteros pods." + data_other_podmins_q: "Sos amministradores de sos àteros pods podent bìdere sos datos meos?" + data_visible_to_podmin_a: "In sustàntzia: totus. Sa comunicatzione intre sos pods est semper criptada (impreende sos sistemas de criptàgiu SSL e de diaspora) ma sos datos sarvados in sos pods non lu sunt. Si cheret, su gestore de sa base de sos datos (database), chi est de sòlitu su chi tenet su pod, podet atzèdere a sos datos de su profilu tuo e a totu su chi as publicadu (comente sutzedit cun belle totus sos sitos web chi sarvant datos de sos utentes). Custa est sa resone proite ti damus sa possibilidade de isseberare in cale pod ti cheres registrare, ca gasi nde podes isseberare unu chi tenet un'amministradore de su cale di fidas. Tènnere unu pod pròpriu est galu mègius pro sa privadesa tua, ca gasi a tènnere atzessu a sa base de sos datos ses petzi tue." + data_visible_to_podmin_q: "Cantos de sos datos meos podent èssere bidos dae s'amministradore de su pod?" + download_data_a: "Eja. In fundu a s'ischeda pro su contu de sas impostatziones tuas as a agatare duos butones: unu pro iscarrigare sos datos tuos e un'àteru pro iscarrigare sas fotografias tuas." + download_data_q: "Potzo iscarrigare una còpia de totu sos datos chi bi sunt in su contu meu?" + move_pods_a: "Sa versione0.7.0.0 de diaspora* frunit su primu passu de su tramudòngiu de contu: como podes esportare totu sos datos tuos dae sa setzione \"Contu\" in sas impostatziones de s'impreadore. Mantene seguros sos datos tuos! In sas versiones imbenientes as a pòdere tramudare su contu intreu tuo, cun sas publicatziones e sos cuntatos, in un'àteru pod." + move_pods_q: "Comente potzo mòere su contu meu dae unu pod a s'àteru?" + title: "Gestione contu e datos" + aspects: + change_aspect_of_post_a: "Nono, ma podes semper fàghere una publicatzione noa cun su matessi cuntenutu publichende·la in una cara diferente." + change_aspect_of_post_q: "A pustis de àere publicadu carchi cosa, potzo cambiare sa cara(as) chi la podent bìdere?" + contacts_know_aspect_a: "Nono. Non podent bìdere sos nùmenes de sas caras, mai." + contacts_know_aspect_q: "Sos cuntatos meos ischint in cale caras los apo postos?" + contacts_visible_a: "Si as a isseberare custa optzione sos cuntatos dae cussa cara ant a pòdere bìdere sos àteros chi bi sunt in intro, in s'ischeda \"Cuntatos\" in sa pàgina de su profilu tuo. (Pro como, petzi sos cuntatos chi sunt in su matessi pod tuo ant a pòdere bìdere s'ischeda \"Cuntatos\" in su profilu tuo.) Est mègius a isseberare custa optziones petzi si sos cuntatos in cussa cara si connoschent unu cun s'àteru, pro esèmpiu si sa cara est pro unu tzìrculu o una sotziedade in sa cale bi ses in intro tue. In cada manera no ant pòdere bìdere su matessi su nùmene de sa cara." + contacts_visible_q: "Ite cheret nàrrere \"permìtere a sos cuntatos in custa cara de si bìdere unu cun s'àteru\"?" + delete_aspect_a: "Incarca \"Caras meas\" in sa barra laterale dae sa vista de su flussu e a pustis incarca in s'icona de sa matita a curtzu de sa cara chi cheres iscantzellare, o bae s sa pàgina de sos cuntatos tuos e ischerta sa cara chi t'interessat. Apustis incarca in s'icona de su botu de s'arga a pitzu de sa pàgina, a destra." + delete_aspect_q: "Comente potzo iscantzellare una cara?" + person_multiple_aspects_a: "Eja. Bae a sa pàgina de sos cuntatos tua e incarca in \"Cuntatos meos\". Pro cada cuntatu podes impreare su menù a destra pro los annànghere (o los bogare) dae totu sas caras chi boles. O los podes annànghere a una cara noa (o los bogare dae una) fintzas incarchende in su butone de s'ischertadore de caras in sa pàgina de su profilu issoro. O, fintzas, podes mòere su puntadore in subra de su nùmene issoro cando lu bides in su flussu, e una ventanedda at a aparire. As a pòdere cambiare sas caras in ue sunt dae ue." + person_multiple_aspects_q: "Potzo annànghere una persone a prus de una cara?" + post_multiple_aspects_a: "Eja. Cando ses creande una publicatzione imprea su butone de sas caras pro ischertare o de-ischertare caras. \"Totus sas caras\" est s'impostatzione predefinida. Sa publicatzione tua at a èssere visìbile a totu sas caras chi as a ischertare. Podes fintzas ischertare sas caras in ue boles publicare in sa barra laterale. Cando pùblicas, sa cara(as) chi as isseberadu in sa lista a manca ant a èssere ischertadas automaticamente in s'ischertadore cando as a incumintzare a fàghere una publicatzione noa." + post_multiple_aspects_q: "Potzo publicare cuntenutos in prus de una cara a sa borta?" + remove_notification_a: "Nono. E no ant a retzire una notìfica nemmancu si los as a annànghere a àteras caras, cando ses giai cumpartzinde cun issos." + remove_notification_q: "Si apo a bogare calicunu dae una cara, o dae totu sas caras, ant a retzire una notìfica de sa cosa?" + rename_aspect_a: "Incarca \"Caras meas\" in sa barra laterale dae sa vista d e su flussu e incarca in s'icona de sa matita a curtzu de sa cara chi cheres cambiare de nùmene, o bae a sa pàgina Cuntatos tua e issèbera sa cara chi boles. A pustis incarca in 'icona de editatzione a curtzu de su nùmene in pitzu de custa pàgina, càmbia su nùmene e incarca \"Agiorna\"." + rename_aspect_q: "Comente potzo cambiare su nùmene a una cara?" + restrict_posts_i_see_a: "Eja. Incarca \"Caras meas\" in sa barra laterale e, a pustis, incarca in una cara in sa lista pro l'ischertare o bogare s'ischertada. Petzi sas publicatziones dae sas persones in sas caras insertadas ant a aparire in su flussu tuo." + restrict_posts_i_see_q: "Potzo limitare sas publicatziones a petzi sos chi sunt in caras isseberadas?" + title: "Caras" + what_is_an_aspect_a: "Sas caras sunt una manera de agrupare sos cuntatos tuos in diaspora*. Si mutint \"caras\" ca sunt comente sas caras diferentes chi mostras a su mundu in momentos diferenetes. Diat pòdere èssere chie ses in su traballu, chie ses pro sa famìlia tua, o chie ses pro sos amigos tuos in unu grupu de su cale faghes parte." + what_is_an_aspect_q: "Ite est una cara?" + who_sees_post_a: "Cando faghes una publicatzione limitada cussa at a èssere visìbile pro sas persones chi as postu in cussa cara (o in cussas caras, si est fata in prus caras) in antis de fàghere sa publicatzione. Sos cuntatos chi non tenes in cussas caras no ant a pòdere bìdere cussa publicatzione. Sas publicatziones limitadas no ant a èssere mai visìbiles a chie non tenes in una de sas caras tuas." + who_sees_post_q: "Cando pùblico in un'aspetu, chie lu bidet?" + community_guidelines: "normas de sa comunidade" + foundation_website: "situ web de sa fundatzione diaspora*" + getting_help: + get_support_a_hashtag: "Pedi publicamente in diaspora* impreende s'eticheta %{question}" + get_support_a_irc: "Intra in %{irc} (tzarrada in direta) cun nois" + get_support_a_tutorials: "Abbista·ti sas %{tutorials} nostras" + get_support_a_website: "Bìsita su %{link} nostru" + get_support_a_wiki: "Chirca su %{link}" + get_support_q: "E si sa dimanda mea non b'est in custas FAQ? In ue potzo andare a pedire agiudu?" + getting_started_a: "Ses fortunadu. Proa sas %{tutorial_series} in su situ de su progetu nostru. T'at a agiudare passu pro passu cun su protzessu de registratzione e t'at a insegnare totu sas cosas de base chi depes connòschere pro impreare bene diaspora*." + getting_started_q: "Agiudade·mi! Mi serbit carchi informatzione de base pro incumintzare!" + title: "Otènnere agiudu" + getting_started_tutorial: "Serie de ghias \"Comente incumintzare\"" + here: "inoghe" + irc: "IRC" + markdown: "Markdown" + mentions: + how_to_mention_a: "Iscrie su sìmbulu \"@\" e incumintza a iscrìere su nùmene suo. Unu menù a ventanedda s'at a abèrrere e l'as a pòdere ischertare in manera prus fàtzile. Ammenta·ti chi est possìbile numenare petzi a sas persones chi as annantu a una cara." + how_to_mention_q: "Comente potzo numenare calicunu cando so publichende una cosa?" + mention_in_comment_a: "Dae sa versione 0.7.0.0 eja! Podes numenare calicunu in unu cummentu in sa matessi manera chi dias impreare pro lu fàghere in una publicatzione, iscriende \"@\" e, a pustis, incumintzende a iscrìere su nùmene suo. Pro praghere ammenta·ti chi cando commentas in una publicatzione chi no est pùblica podes numenare petzi impreadores chi ant giai interagidu cun sa publicatzione." + mention_in_comment_q: "Potzo numenare calicunu in unu cummentu?" + see_mentions_a: "Eja, incarca \"@Numenadas\" in sa culunna a manca in sa pàgina printzipale tua." + see_mentions_q: "B'est una manera pro abbistare in cale publicatziones so istadu numenadu?" + title: "Numenadas" + what_is_a_mention_a: "Una numenada est unu ligàmene a sa pàgina de su profilu de una persone chi aparit in una publicatzione. Cando calicunu est numanedu retzit una notìfica chi li sinnalat sa publicatzione." + what_is_a_mention_q: "Ite est una \"numenada\"?" + miscellaneous: + back_to_top_a: "Eja. A pustis de àere fatu cùrrere in suta una pàgina, incarca in sa fritza murra chi at a aparire in s'àngulu in bassu a destra de sa bentana de s'esploradore/navigadore (browser) tuo." + back_to_top_q: "B'est una manera lestra de torrare a s'incumintzu de una pàgina a pustis de àere fata cùrrere in suta?" + diaspora_app_a: "Bi sunt istadas medas aplicatziones pro Android in isvilupu dae mebros de sa comunidade. Calicunas sunt progetos abbandonados dae meda e pro custa resone non funtzionant comente si tocat cun sa versione atuale de diaspora*. Non t'isetes meda dae custas aplicatziones, in custu momentu. Non b'est un'aplicatzione pro iOS, pro como. Sa mègius manera de atzèdere a diaspora* dae su dispositivu mòbile suo est impreende un'esploradore/navigadore (browser), ca amus progetadu una versione mòbile de su situ chi diat dèpere funtzionare bene in totu sos dispositivos, fintzas si non tenet galu totu sas funtzionalidades." + diaspora_app_q: "B'est un'aplicatzione de diaspora* pro Android o iOS?" + photo_albums_a: "Nono, pro como. In cada manera podes abbistare sas immàgines carrigadas dae una persone in suta de s'ischeda de sas fotografias in sa pàgina de su profilu suo." + photo_albums_q: "Bi sunt albums de fotografias o vìdeos?" + subscribe_feed_a: "Eja, ma custa no est galu una funtzionalidade afinada e sa formatatzione de sos risultados est galu fata a sa grussera. Si boles proare su matessi, bae a sa pàgina de profilu de calicunu e incarca su butone de su feed in s'esploradore/navigadore tuo (browser), o podes copiare su ligàmene URL de su profilu (es: https://nùmenepod.org/people/carchinùmeru) e lu podes incollare in su leghidore de feeds. S'indiritzu de su feed risultante at a aparire una cosa gasi: https://nùmenepod.org/public/nùmeneimpreadore.atom – diaspora* impreat Atom imbetzes de RSS." + subscribe_feed_q: "Potzo sighire sas publicatziones pùblicas cun unu leghidore de feeds?" + title: "Vàrias" + pods: + find_people_a: "Si cheres invitare sos amigos tuos a s'aunire a diaspora*, imprea su ligàmene de invitu o su ligàmene pro p. eletrònica in sa barra laterale. Sighi #etichetas pro iscobèrrere àteras persones chi tenent sos matessi interessos tuos, e annanghe sos chi publicant cosas chi t'interessant a una cara. Pùblica cun s'eticheta #nouinoghe pro lu fàghere ischire a sa gente e calicunu t'at a dare su \"bene bènnidu\"." + find_people_q: "Mi so registradu como como in unu pod, comente agato persones cun las cales cumpartzire?" + title: "Pods" + use_search_box_a: "Podes chircare una persone impreende su nùmene impreadore o su nùmene diaspora* suo (su nùmene chi est ammustradu in su profilu suo). Si ambos custos mètodos non funtzionant inserta s'ID diaspora* intreu suo (es: nùmeneimpreadore@nùmenepod.org) . Si una chirca no agatat risultados sa prima borta, diat pòdere èssere pro more de problemas de retza. Torra a proare prus a tardu." + use_search_box_q: "Comente potzo impreare su campu de chirca pro agatare calicunu in particulare?" + what_is_a_pod_a: "Unu pod est unu server in ue est installadu su programma de diaspora* e chi est connessu a sa retza de diaspora*.\"Pod\" est una metàfora chi faghet riferimentu a sas cambas de sos frores, chi cuntenint sas semesntas, gasi comente unu server cuntenit meda contos. Bi sunt meda contos diferentes. Podes annànghere amigos dae àteros pods e comunicare chin issos. Non b'est bisòngiu de abèrrere unu contu in pods diferentes! Unu bastat – in custa manera, podes pensare a unu pod de diaspora* comente a carchi cosa de sìmile a unu frunidore de posta eletrònica. Esistint pods pùblicos, privados, e cun unu pagu de apentu ti nde podes fàghere unu personale tuo." + what_is_a_pod_q: "It'est unu pod?" + posts_and_posting: + char_limit_services_a: "In custu casu dias limitare sa publicatzione tua a cussu lìmite de caràteres (140 in su casu de Twitter; 1000 in cussu de Tumblr), e su nùmeru de caràteres chi galu tenes est ammustradu cando s'icona de su servìtziu est alluta. Podes publicare in custos servìtzios fintzas si sa publicatzione tua est prus longa de su lìmite issoro, ma su testu at a bènnere truncadu in ie cun unu ligàmene a sa publicatzione in diaspora*." + char_limit_services_q: "E si so cumpartzinde sa publicatzione mea cun unu servìtziu ligadu chi tenet unu lìmite de caràteres prus minore?" + character_limit_a: "65,535 caràteres. Sunt 65,395 caràteres in prus de sos chi tenes in Twitter! ;)" + character_limit_q: "Cale est su lìmite de caràteres pro sas publicatziones?" + embed_multimedia_a: "De sòlitu bastat a incollare su ligàmene URL (es: http://www.youtube.com/watch?v=nnnnnnnnnnn ) in sa publicatzione tua e su vìdeu o su documentu àudio at a èssere insertadu automaticamente. Sos sitos suportados incluint: YouTube, Vimeo, SoundCloud, Flickr e calicun'àteru. diaspora* impreat oEmbed pro custa funtzionalidade. Prus tempus colat e prus sitos e mitzas de cuntenutos amus a suportare, nde semus annanghinde semper. Ammenta·ti de impreare semper sos ligàmenes intreos – cussos incurtzados no andant bene; perunu operadore a pustis de s'URL de base – e iseta carchi segundu in antis de torrare a carrigare sa pàgina a pustis de sa publicatzione pro bìdere s'anteprima." + embed_multimedia_q: "Comente potzo insertare unu vìdeu, unu documentu àudio o àteros cuntenutos multimediales esternos in una publicatzione?" + format_text_a: "diaspora* Impreat unu sistema semplificadu chi si mutit %{markdown}. Su publicadore tenet butones chi agiudant a formatare su testu. Si cheres formatare manualmente sa publicatzione tua, podes agatare sa sintassi Markdown intrea %{here}. Su butone pro s'anteprima est meda de agiudu inoghe, ca ti permitit de bìdere comente ant a aparire sas publicatziones tuas in antis chi tue las cumpartzas. Ammenta·ti chi non las podes acontzare a pustis de sa publicatzione e, pro custu motivu, de impreare s'anteprima pro èssere seguru chi totu siat a postu in antis de incarcare Cumpartzi!" + format_text_q: "Comente potzo formatare su testu in sas publicatziones meas (grassetu, corsivu etz.)?" + hide_posts_a: "Si colas su puntadore in subra de una publicatzione, a pitzu, una X at a aparire a destra. Incarca·la pro istichire sa publicatzione e istudare sas notìficas chi li pertocant. As a pòdere galu bìdere sa publicatzione si as a bisitare sa pàgina de profilu de sa persone chi l'at publicada." + hide_posts_q: "Comentze potzo istichire una publicatzione?" + insert_images_a: "Si cheres incluire in sa publicatzione tua un'immàgine sarvada in s'elaboradore tuo Incarca in s'icona chi tenet sa forma de una fotocàmera in fundu a su publicadore.Podes fintzas trisinare e lassare un'immàgine, o prus immàgines, dae s'elaboradore tuo a intro de cuss'icona. Si cheres insertare un'immàgine dae ìnternet in sa publicatzione tua incarca su butone pro sas immàgines in pitzu de su publicadore, chi at a creare su còdighe Markdown pro tie." + insert_images_comments_q: "Potzo insertare immàgines in sos cummentos?" + insert_images_q: "Comente potzo insertare immàgines in sas publicatziones meas?" + size_of_images_a: "Nono. Sas immàgines benint ridimensionadas automaticamente pro intrare in sa vista de su flussu o de sa publicatzione sìngula. Markdown non tenet unu còdighe pro dislindare sa mannària de un'immàgine." + size_of_images_q: "Potzo personalizare sa mannària de sas immàgines in sas publicatziones o in sos cummentos?" + stream_full_of_posts_a1: "In su flussu tuo bi sunt tres castas de publicatziones:" + stream_full_of_posts_li1: "Publicatziones de gente cun sa cale ses cumpartzinde, de duas genias: publicatziones pùblicas e publicatziones limitadas cun una cara in ue bi ses tue. Pro bogare custas publicatziones dae su flussu tuo firma sa cumpartzidura cun cussa persone." + stream_full_of_posts_li2: "Publicatziones pùblicas chi cuntenent una de sas etichetas chi sighis. Pro las bogare, acabba·la de sighire cussa eticheta." + stream_full_of_posts_li3: "Publicatziones pùblicas de impreadores in evidèntzia in sa comunidade. Custas podent èssere bogadas istudende s'optzione \"Ammustra \"in evidèntzia in sa comunidade\" in su flussu tuo\" in sas optziones in s'ischeda de su contu de sas impostatziones tuas." + stream_full_of_posts_q: "Proite su flussu meu est prenu de publicatziones de gente disconnota e cun sa cale non so cumpartzinde?" + title: "Publicatzione" + private_posts: + can_comment_a: "Petzi impreadores chi as annantu in cussa cara in antis de fàghere sa publicatzione podent cummentare o sinnalare chi lis agradat, e petzi cando sunt intrados in su contu issoro." + can_comment_q: "Chie podet cummentare o sinnalare s'agradessimentu suo in sas publicatziones privadas meas?" + can_reshare_a: "Nemos. Sas publicatziones privadas non podent èssere torradas a cumpartzire. Sos impreadores in cussa cara, però, dae su contu issoro lu diant pòdere copiare e incollare. De ti fidare o nono de issos est un'issèbera tua!" + can_reshare_q: "Chie podet torrare a cumpartzire sas publicatziones privadas meas?" + see_comment_a: "Petzi sas persones cun sas cales fiat cumpartzida sa publicatzione (sas persones chi sunt in sas caras isseberadas dae su publicadore originale) podent bìdere sos cummentos e sos agradessimentos. " + see_comment_q: "Cando cummento o sinnalo chi m'agradat una publicatzione privada, chie lu podet bìdere?" + title: "Publicatziones privadas" + who_sees_post_a: "Petzi impreadores chi as annantu in cussa cara in antis de fàghere sa publicatzione la podent bìdere, e petzi cando sunt intrados in su contu issoro." + who_sees_post_q: "Cando pùblico carchi cosa in una cara (creo una publicatzione privada) chie la podet bìdere?" + profile: + title: "Profilu" + whats_in_profile_q: "Ite b'est in su profilu meu?" + public_posts: + can_comment_reshare_like_a: "Totu sos chi tenent unu contu de diaspora* e chi bi sunt in intro podent cummentare o cumpartzire sa publicatzione tua, o sinnalare chi lis agradat. S'etzetzione sunt sos chi as ignoradu, chi no ant a pòdere pònnere agradessimentos o cummentare in sas publicatziones tuas." + can_comment_reshare_like_q: "Chie podet cummentare o cumpartzire sa publicatzione mea, o sinnalare chi lis agradat?" + deselect_aspect_posting_a: "Boghende s'ischerta a sas caras no at a tènnere efetu perunu in una publicatzione pùblica. At a abarrare pùblica e at galu a aparire in su flussu de totu sos cuntatos tuos. Pro fàghere una publicatzione chi siat visìbile petzi a carchi cara dislindada, depes ischertare cussas caras dae s'ischertadore in suta de su publicadore." + deselect_aspect_posting_q: "Ite acontesset cando bogo s'ischerta a una o prus caras in sa culunna a manca faghende una publicatzione pùblica?" + find_public_post_a: "Sas publicatziones pùblicas tuas ant a aparire in su flussu de totu sos chi ti sighint. Si as incluidu #etichetas in sa publicatzione pùblica tua totu sos chi sighint cussas etichetas ant a bìdere sa publicatzione tua in su flussu issoro. Totu sas publicatziones pùblicas tenet fintzas unu ligàmene URL suo chi cadaunu podet bìdere, fintzas chene intrare in sos contos issoro – pro custa resone sas publicatziones pùblicas podent èssere bidos pro mèdiu de ligàmenes postos diretamente in Twitter, blogs, etz. Sas publicatziones pùblicas diant pòdere èssere fintzas inditzitzadas dae sos motores de chirca." + find_public_post_q: "Comente podent sos àteros agatare sas publicatziones pùblicas meas?" + see_comment_reshare_like_a: "Sos cummentos, agradessimentos, e ri-cumaprtziduras de sas publicatziones pùblicas sunt pùblicos. Totus sos chi sunt impreende unu contu de diaspora* e fintzas totu sos àteros chi sunt in ìnternet podent bìdere sas interatziones tuas cun una publicatzione pùblica." + see_comment_reshare_like_q: "Cando cummento, cumpartzo, o sinnalo chi m'agradat una publicatzione pùblica, chie lu podet bìdere?" + title: "Publicatziones pùblicas" + who_sees_post_a: "Totu sos chi tenent ìnternet diant potentzialmente bìdere una publicatziones chi sinnas comente \"pùblica\", e pro custa resone depes istare atentu a nde èssere seguru a beru in antis de lu fàghere. Est una manera ispantosa de comunicare cun su mundu." + who_sees_post_q: "Cando pùblico carchi cosa in manera pùblica, chie lu podet bìdere?" + resharing_posts: + reshare_private_post_aspects_a: "Nono, no est possìbile a torrare a cumpartzire una publicatzione privada. Custu pro rispetare sas intentziones de su publicadore originale, chi l'at cumpartzida petzi cun unu grupu particulare de persones." + reshare_private_post_aspects_q: "Potzo torrare a cumpartzire una publicatzione privada in caras ischertadas?" + reshare_public_post_aspects_a: "Nono, cando torras a cumpartzire una publicatzione pùblica cussa diventat automaticamente una de sas publicatziones pùblicas tuas. Pro la cumpartzire petzi cun carchi cara isseberada còpia e incolla su cuntenutu in una publicatzione limitada noa." + reshare_public_post_aspects_q: "Potzo torrare a cumpartzire una publicatzione pùblica cun petzi carchi cara?" + title: "Torrare a cumparztire publicatziones" + sharing: + add_to_aspect_a1: "Naramus chi Amy at annantu Ben a una cara, ma Ben no at (galu) annantu Amy a una cara:" + add_to_aspect_a2: "Custa est connota comente \"cumpartzidura assimmètrica\". Si e cando Ben at a annànghere Amy a una cara at a divènnere una cumpartzidura simmètrica, cun ambas sas publicatziones pùblicas e sas privadas chi lis pertochent de ambos Amy e Ben chi lis ant a aparire in sos flussos issoro, e Amy at a pòdere bìdere su profilu privadu de Ben. Tando s'ant fintzas a pòdere imbiare messàgios privados unu cun s'àtera." + add_to_aspect_li1: "Ben at a retzire una notìfica chi l'at a nàrrer chi Amy at \"incumintzadu a cumpartzire\" cun Ben." + add_to_aspect_li2: "Amy at a incumintzare a bìdere sas publicatziones pùblicas de Ben in su flussu suo." + add_to_aspect_li3: "Amy no at a bìdere nissuna de sas publicatziones privadas de Ben." + add_to_aspect_li4: "Ben no at a bìdere sas publicatziones pùblicas o privadas de Amy in su flussu suo." + add_to_aspect_li5: "Ma si Ben at a andare a sa pàgina de su profilu de Amy, tando at a bìdere sas publicatziones privadas chi Amy faghet in sa cara in ue l'at postu (in paris cun sas publicatziones pùblicas de issa, chi totus podent bìdere in ie)." + add_to_aspect_li6: "Ben at a pòdere bìdere su profilu privadu de Amy (biografia, logu, natura, data de nàschida)." + add_to_aspect_li7: "Amy at a aparire in suta de \"Petzi cumpartzinde cun mie\" in sa pàgina de sos cuntatos de Ben." + add_to_aspect_q: "Ite acontessit cando annango calicunu a una de sas caras meas, o cando calicunu m'annanghet a una de sas caras suas?" + list_not_sharing_a: "Nono, ma podes bìdere si calicunu est o no est cumpartzende cun bois bisitende sa pàgina de profilu issoro. Si lu sunt faghende, b'at a èssere una icona birde a un'ala de s'ID diaspora suo. Si nono, b'at a èssere unu chircu murru." + list_not_sharing_q: "B'est una lista de sa gente chi apo annantu a unu de sas caras, ma chi non m'ant annantu a una de sas issoro?" + only_sharing_a: "Sunt persones chi t'ant annantu a una de sas caras issoro, ma chi tue no as (galu) annantu a una de sas tuas. In àteras paràulas: issos sunt cumpartzinde cun tie, ma tue non ses cumpartzinde cun issos: lu podes bìdere comente si issos ti fiant \"sighinde\". Si los as a annànghere a una cara, tando, ant a aparirein suta de cussa cara imbetzes chi in suta de \"Petzi cumpartzinde cun mie\". Abbista in susu." + only_sharing_q: "Chie sunt sas persones in sa lista in suta de \"Petzi cumpartzinde cun mie\" in sa pàgina mea de sos cuntatos?" + see_old_posts_a: "Nono. At a pòdere bìdere petzi sas publicatziones noas in cussa cara. Issu (in paris a totu sos àteros) at a pòdere bìdere sas publicatziones tuas prus betzas in sa pàgina de su profilu tua, e l'at a pòdere bìdere fintzas in su flussu suo." + see_old_posts_q: "Cando annango calicunu a una cara, podet bìdere sas publicatziones prus betzas chi apo giai publicadu in cussa cara?" + title: "Cumpartzende" + tags: + filter_tags_a: "Custu no est galu disponìbile in manera direta pro mèdiu de diaspora*, ma bi sunt %{third_party_tools} chi lu diant pòdere permìtere." + filter_tags_q: "Comente potzo filtrare/esclùdere carchi eticheta dae su flussu meu?" + followed_tags_a: "A pustis de àere chircadu un'eticheta podes incarcare su butone in pitzu de sa pàgina de s'eticheta pro \"sighire\" cussa eticheta. Gasi at aparire in sa lista de sas etichetas sighidas tuas in su menù a manca. Incarchende una de sas etichetas sighidas dae tie s'at a abèrrere sa pàgina de cussa eticheta in manera de ti permìtere de bìdere sas publicatziones reghentes chi cuntenit cussa eticheta. Incarca in #Etichetas Sighidas pro bìdere unu flussu de publicatziones chi incluit una de sas etichetas sighidas. Sas publicatziones chi incluint cussa eticheta ant fintzas a èssere annantas a su flussu printzipale tuo." + followed_tags_q: "Ite sunt sas “#Etichetas Sighidas” e comente potzo sighire un'eticheta?" + people_tag_page_a: "Sunt persones chi ant postu cussa eticheta in sa descritzione issoro in su profilu pùblicu." + people_tag_page_q: "Chie sunt sas persones allistadas in s'ala a manca de sa pàgina de s'eticheta?" + tags_in_comments_a: "Un'eticheta annanta a unu cummentu at a aparire in unu ligàmene in sa pàgina de cussa eticheta, ma no at a fàghere aparire cussa publicatzione (o cummentu) in sa pàgina de cussa eticheta. Custu funtzionat petzi pro sas etichetas in sas publicatziones." + tags_in_comments_q: "Potzo pònnere etichetas in sos cummentos o petzi in sas publicatziones?" + title: "Etichetas" + what_are_tags_for_a: "Sas etichetas sunt una manera pro categorizare sas publicatziones, de sòlitu pro argumentu. Chirchende un'eticheta as a bìdere totu sas publicatziones, pùblicas e privadas, chi podes bìdere cun cussa eticheta. Custu at a permìtere a chie est interessadu in unu argumentu dislindadu de agatare publicatziones pùblicas chi li pertochent." + what_are_tags_for_q: "A ite serbint sas etichetas?" + third_party_tools: "Ainas esternas" + title_header: "Agiudu" + tutorial: "ghia" + tutorials: "ghias" + wiki: "wiki" invitations: create: + empty: "Pro praghere inserta a su mancu un'indiritzu de posta eletrònica." no_more: "Non tenes prus invitos." + note_already_sent: "Sos invitos sunt istados giai imbiados a: %{emails}" rejected: "Custos indiritzos de posta eletrònica ant tentu problemas: %{emails}" sent: "Sos invitos sunt istados imbiados a: %{emails}" new: + codes_left: + one: "Tenes galu un'invitu cun custu còdighe" + other: "Tenes galu %{count} invitos cun custu còdighe" + zero: "Non tenes prus invitos cun custu còdighe" + comma_separated_plz: "Podes insertare prus indiritzos de posta eletrònica separados dae vìrgulas." invite_someone_to_join: "Invita calicunu a intrare in diaspora*!" language: "Limba" + paste_link: "Cumpartzi custu ligàmene cun sos amigos tuos pro los invitare in diaspora*, o imbia·li su ligàmene diretamente cun una e-lìtera." send_an_invitation: "Imbia un'invitu" + sending_invitation: "Imbiende s'invitu..." layouts: application: back_to_top: "Torra a s'incumintzu" powered_by: "Suportadu dae diaspora*" public_feed: "Flussu de diaspora* pùblicu de %{name}" + source_package: "Iscàrriga su pachete de su còdighe mitza" + toggle: "Allughe/istuda sa versione mòbile" whats_new: "Ite b'est de nou?" header: code: "Còdighe" @@ -181,8 +445,24 @@ sc: other: "%{actors} ant cummentadu sa publicatzione tua %{post_link}." zero: "%{actors} at cummentadu sa publicatzione tua %{post_link}." index: + all_notifications: "Totu sas notìficas" + also_commented: "Àteros cummentos" and: "e" + and_others: + one: "e un'àteru" + other: "e àteros %{count}" + zero: "e nissun'àteru" + comment_on_post: "Cummentu in una publicatzione" + liked: "Agradèssidu" + mark_all_as_read: "Sinnala·las totu comente lèghidas" + mark_read: "Sinnala comente lèghida" + mark_unread: "Sinna·las comente non lèghidas" + mentioned: "Numenadu in una publicatzione" notifications: "Notìficas" + reshared: "Torrada a cumparzire" + show_all: "Ammustra totu" + show_unread: "Ammustra sas non lèghidas" + started_sharing: "Incumintzadu a cumpartzire" liked: one: "A %{actors} agradat sa publicatzione tua %{post_link}." other: "A %{actors} agradat sa publicatzione tua %{post_link}." @@ -218,6 +498,12 @@ sc: notifier: a_post_you_shared: "una publicatzione." click_here: "Incarca inoghe" + comment_on_post: + reply: "Risponde o abbista sa publicatzione de %{name} >" + confirm_email: + click_link: "Pro ativare s'indiritzu de posta eletrònica nou tuo %{unconfirmed_email} pro praghere sighi custu ligàmene:" + subject: "Pro praghere ativa s'indiritzu de posta eletrònica tuo %{unconfirmed_email}" + email_sent_by_diaspora: "Custa e-lìtera est istada imbiada dae %{pod_name}. Si dias prefèrrere a l'acabare de retzire lìteras comente a custa," export_photos_email: body: |- Salude, %{name}, @@ -227,39 +513,345 @@ sc: Saludos, Su robot de sa posta eletrònica de diaspora*! hello: "Salude %{name}!" + invite: + message: |- + Salude! + + Ses istadu invitadu a t'iscrìere a diaspora* dae %{user}! + + Incarca in custu ligàmene pro incumintzare + + [%{invite_url}][1] + + O podes fintzas annànghere %{diaspora_id} a sos cuntatos tuos si tenes giai unu contu. + + + Salude e trigu, + + Su robot de sa posta eletrònica de diaspora*! + + P.S.: Si (galu) no ischis ite est diaspora*, [inoghe][2] b'est sa risposta! + + [1]: %{invite_url} + [2]: %{diasporafoundation_url} + invited_you: "%{name} t'at invitadu a t'iscrìere a diaspora*" liked: liked: "A %{name} l'agradat sa publicatzione tua" + view_post: "Abbista publicatzione >" + mentioned: + subject: "%{name} t'at numenadu in diaspora*" private_message: + reply_to_or_view: "Risponde o abbista custu arresonu >" subject: "B'est unu messàgiu privadu nou pro tie" + report_email: + body: |- + Salude, + + s'elementu %{type} cun ID %{id} est istadu sinnaladu comente ofensivu. + + Resone: "%{reason}" + + [%{url}][1] + + Pro praghere verifica·lu prus in presse chi podes! + + + Saludos, + + Su robot de p. eletrònica de diaspora*! + + [1]: %{url} + subject: "Un'elementu (%{type}) est istadu sinnaladu comente ofensivu" + type: + comment: "cummentu" + post: "publicatzione" + reshared: + reshared: "%{name} at cumpartzidu sa publicatzione tua" + view_post: "Abbista publicatzione >" + single_admin: + admin: "S'amministradore diaspora* tuo" + subject: "Unu messàgiu a pitzu de su contu diaspora* tuo:" started_sharing: + sharing: "at incumintzadu a cumpartzire cun tie!" + subject: "%{name} at incumintzadu a cumpartzire cun tie in diaspora*" view_profile: "Abbista su profilu de %{name}" thanks: "Gràtzias," + to_change_your_notification_settings: "pro mudaee sas impostatziones de notìfica tuas" nsfw: "NSFW (no est adatu pro unu logu de traballu)" ok: "AB" people: + add_contact: + invited_by: "Ses istadu invitadu dae" + index: + couldnt_find_them: "Non l'as agatadu/a?" + looking_for: "Ses chirchende publicatziones etichetadas cun %{tag_link}?" + no_one_found: "...e nemos est istadu agatadu." + no_results: "Ehi! Depes iscriere carchi cosa pro chircare." + results_for: "Impreadores currelados a %{search_term}" + search_handle: "Imprea s'ID diaspora* issoro (nùmeneimpreadore@pod.tld) pro tènnere sa tzerteza de agatare sos amigos tuos." + searching: "Chirchende, pro praghere iseta..." + send_invite: "Galu nudda? Imbia un'invitu!" + person: + thats_you: "Ses tue!" profile_sidebar: + bio: "Biografia" born: "Die de nàschida" gender: "Gènere" location: "Logu" + show: + closed_account: "Custu contu est istadu serradu." + does_not_exist: "Custa persone no esistit!" + has_not_shared_with_you_yet: "%{name} no at galu cumpartzidu peruna publicatzione cun tie!" photos: + create: + integrity_error: "Carrigamentu de sa fotografia fallidu. Seguru ses chi cussa fiat un'immàgine?" + runtime_error: "Carrigamentu de sa fotografia fallidu. As ismentigadu de pònnere sa tzinta de sa màchina?" + type_error: "Carrigamentu de sa fotografia fallidu. Seguru ses de àere annantu un'immàgine?" destroy: notice: "Fotografia iscantzellada." new_profile_photo: upload: "Càrriga una fotografia de profilu noa!" + posts: + presenter: + title: "Una publicatzione de %{name}" + show: + photos_by: + one: "Una fotografia de %{author}" + other: "%{count} fotografias de %{author}" + zero: "Peruna fotografia de %{author}" + reshare_by: "Cumpartzidu dae %{author}" privacy: "Privadesa" profile: "Profilu" + profiles: + edit: + allow_search: "Permiti a sos àteros de ti chircare in intro de diaspora*" + first_name: "Nùmene" + last_name: "Sambenadu" + nsfw_check: "Sinna totu sos chi cumpartzo comente NSFW" + nsfw_explanation: "NSFW (“not safe for work”, non apropriadu pro su traballu) est s'istandard de sa comunidade pro su cuntenutu chi diat pòdere non èssere adatu pro èssere bidu cando ses in unu logu de traballu. Si tenes s'intentzione de cumpartzire custa casta de materiale in manera fitiana pro praghere incarca custa optzione pro istichire totu sos chi cumpartzis dae sos flussos de sa gente, si non isseberant de lu bìdere." + nsfw_explanation2: "Si as isseberadu de non ischertare custa optzione pro praghere annanghe s'eticheta #nsfw cada borta chi cumpartzis carchi cosa de custa casta." + update_profile: "Agiorna su profilu" + your_bio: "Sa biografia tua" + your_birthday: "Su compleannu tuo" + your_gender: "Gènere" + your_location: "In ue ses" + your_name: "Su nùmene tuo" + your_photo: "Sa fotografia tua" + your_tags: "Descrie·ti in 5 paràulas" + your_tags_placeholder: "Pro esèmpiu #films #gatos #biàgios #mùsica #nùgoro" + update: + failed: "Agiornamentu de su profilu fallidu" + updated: "Profilu agiornadu" public: "Pùblicu" + registrations: + closed: "Sas registratziones sunt serradas in custu pod de diaspora*." + create: + success: "Ti ses registradu in diaspora*!" + invalid_invite: "Su ligàmene de invitu chi as impreadu no est prus vàlidu!" + new: + email: "P. eletr. (e-mail)" + enter_email: "Inserta s'indiritzu de posta eletrònica tuo" + enter_password: "Inserta una crae de intrada (màssimu ses caràteres)" + enter_password_again: "Inserta sa matessi crae chi as iscritu in antis" + enter_username: "Issèbera unu nùmene impreadore (petzi lìteras, nùmeros e tratigheddos bassos)" + password: "Crae" + password_confirmation: "Cunfirma sa crae" + sign_up: "Crea unu contu" + submitting: "Imbiende..." + username: "Nùmene impreadore" + report: + comment_label: "Cummentu: %{data}" + delete_link: "Iscantzella elementu" + post_label: "Publicatzione: %{content}" + reason_label: "Resone:" + reported_label: "Sinnaladu dae %{person}" + review_link: "Sinna comente verificadu" + title: "Summàriu de sas verìficas" + reshares: + comment_email_subject: "Sa cumpartzidura de %{resharer} de sa publicatzione de %{author}" + reshare: + deleted: "Publicatzione originale iscantzellada dae s'autore." + reshare_confirmation: "Cumpartzire sa publicatzione de %{author}?" + reshared_via: "Cumpartzidu pro mèdiu de" search: "Chirca" + services: + create: + already_authorized: "Un'impreadore cun id diaspora %{diaspora_id} at giai autorizadu cussu contu de %{service_name}." + failure: "Autenticatzione fallida." + read_only_access: "S'atzessu est in modalidade petzi leghidura, pro praghere torra a proare a l'autorizare prus a tardu" + success: "Autenticatzione resissida." + destroy: + success: "Iscantzellamentu de s'autenticatzione resissidu." + failure: + error: "B'est istadu un'errore in sa connessione a cussu servìtziu" + index: + disconnect: "Disconnete" + edit_services: "Modìfica sos servìtzios" + logged_in_as: "Atzessu fatu comente %{nickname}." + really_disconnect: "Disconnètere %{service}?" + services_explanation: "Cunnetende·ti a servìtzios esternos as a tènnere sa possibilidade de publicare in ie su chi iscries in diaspora*." settings: "Impostatziones" + shared: + aspect_dropdown: + toggle: + one: "In %{count} cara" + other: "In %{count} caras" + invitations: + by_email: "Invita gente pro mèdiu de e-lìteras" + invite_your_friends: "Invita sos amigos tuos" + invites: "Invitos" + share_this: "Cumpartzi custu ligàmene impreende sa posta eletrònica, sos blogs o sas retzas sotziales!" + public_explain: + atom_feed: "Flussu Atom" + control_your_audience: "Manìgia su pùblicu tuo" + logged_in: "Atzessu fatu in %{service}" + manage: "Manìgia sos servìtzios ligados" + new_user_welcome_message: "Imprea sos #cantzelletos pro classificare sas publicatziones tuas e agatare persones chi cumpartzint sos interessos tuos. Nùmena perones ispantosas cun @Numenadas" + outside: "Sos messàgios pùblicos ant a èssere disponìbile fintzas a sa vista de chie est in foras de diaspora*." + share: "Cumpartzi" + title: "Imposta servìtzios ligados" + visibility_dropdown: "Imprea custu menù pro mudare sa visibilidade de sa publicatzione tua. (Pro custa prima publicatzione ti cunsigiamus de la lassare pùblica.)" + publisher: + discard_post: "Iscantzella sa publicatzione" + formatWithMarkdown: "Podes impreare %{markdown_link} pro formatare sa publicatzione tua" + get_location: "Agata sa positzione tua" + new_user_prefill: + hello: "Salude a totus, so #%{new_user_tag}. " + i_like: "Sos interessos meos sunt %{tags}. " + invited_by: "Gràtzias pro s'invitu, " + newhere: "nouinoghe" + poll: + add_a_poll: "Annanghe unu sondàgiu" + posting: "Publichende..." + remove_location: "Boga sa positzione" + share: "Cumpartzi" + whats_on_your_mind: "A ite ses pensende?" + stream_element: + via: "Pro mèdiu de %{link}" + via_mobile: "Pro mèdiu de unu tzellulare" + simple_captcha: + label: "Inserta su còdighe in s'iscatuledda:" + message: + default: "Su còdighe segretu non currispondet cun s'immàgine" + failed: "Sa verìfica de s'umanidade est fallida" + user: "S'immàgine segreta e su còdighe sunt diferentes" + placeholder: "Inserta su valore de s'immàgine" + status_messages: + new: + mentioning: "Ses numenende: %{person}" + too_long: "Pro praghere iscrie un'istadu cun prus pagu de %{count} caràteres. In custu momentu bi sunt %{current_length} caràteres." streams: + activity: + title: "Atividade mea" admin: title: "Amministradore" + aspects: + title: "Caras meas" + aspects_stream: "Caras" + comment_stream: + title: "Publicatziones cummentadas" commented: title: "Publicatziones cummentadas" + community_spotlight_stream: "In evidèntzia in sa comunidade" + followed_tag: + add_a_tag: "Annanghe un'eticheta" + follow: "Sighi" + title: "#Etichetas sighidas" + followed_tags_stream: "#Etichetas sighidas" + like_stream: + title: "Publicatziones chi t'agradant" liked: title: "Publicatziones agradadas" + mentioned_stream: "@Numenadas" + mentions: + title: "@Numenadas" + multi: + title: "Flussu" + public: + title: "Atividade pùblica" + tags: + title: "Publicatziones cun s'eticheta: %{tags}" + tags: + show: + follow: "Sighi #%{tag}" + none: "S'eticheta bòida no esistit!" + stop_following: "Acaba·la de sighire #%{tag}" username: "Nùmene impitadore" users: + confirm_email: + email_confirmed: "P. eletrònica %{email} ativada" + email_not_confirmed: "S'indiritzu de p. eletrònica no est istadu aviadu. B'est unu problema cun su ligàmene?" + destroy: + no_password: "Pro praghere inserta sa crae atuale tua pro serrare su contu tuo." + success: "Su contu tuo est istadu blocadu. Nos podent bòlere finas a 20 minutos pro acabare de serrare su contu tuo. Gràtzias pro àere proadu diaspora*." + wrong_password: "Sa crae insertada no est sa chi ses impreande como." edit: + also_commented: "calicunu at cummentadu una publicatzione chi as cummentadu fintzas tue" + auto_follow_aspect: "Cara pro sos impreadores cun sos cales cumpartzis automaticamente:" + auto_follow_back: "Cumpartzi automaticamente cun sos impreadores chi incumintzant a cumpartzire cun tie" + change: "Càmbia" + change_email: "Càmbia s'indiritzu de posta eletrònica" + change_language: "Càmbia sa limba" + change_password: "Càmbia sa crae de intrada" + character_minimum_expl: "depet tènnere a su mancu ses caràteres" + close_account: + dont_go: "Ajò, non ti c'andes!" + lock_username: "Su nùmene impreadore tuo at a èssere blocadu. No as a pòdere prus creare unu contu in custu pod cun su matessi ID." + locked_out: "As a èssere bogadu a foras dae su contu tuo e non b'as a pòdere intrare prus finas a cando no at a èssere istadu iscantzelladu." + make_diaspora_better: "Nos diat agradare meda a tènnere s'agiudu tuo pro megiorare diaspora*; si cheres nos podes dare una manu, imbetzes de ti c'andare. Si ti che cheres andare a beru custu est su chi depes fàghere:" + mr_wiggles: "Mr Wiggles at a èssere tristu si ti c'andas!" + no_turning_back: "No as a pòdere prus torrare in segus! Si a beru ses seguru, inserta sa crae tua inoghe in suta." + what_we_delete: "Amus a iscantzellare totu sas publicatziones tuas e sos datos de su profilu tuo su prus in presse chi podimus. Sos cummentos tuos in sas publicatziones de àtera gente ant a abarrare, ma ant a èssere atzotziados a s'ID diaspora* tuo imbetzes chi a su nùmene tuo." + close_account_text: "Serra su contu" + comment_on_post: "calicunu cummentat una publicatzione tua" + current_password: "Crae de como" + current_password_expl: "sa chi impreas pro intrare..." download_export_photos: "Iscàrriga sas fotos meas" - export_photos_in_progress: "Semus elaborande sas fotos tuas. Pro piaghere torra a compidare intre pagu." \ No newline at end of file + edit_account: "Modìfica su contu" + email_awaiting_confirmation: "Amus imbiadu unu ligàmene de cunfirma a%{unconfirmed_email}. Finas a cando no as a àere abertu cussu ligàmene e no as a àere ativadu s'indiritzu nou amos a impreare s'indiritzu originale tuo %{email}." + export_data: "Esporta sos datos" + export_photos_in_progress: "Semus elaborande sas fotos tuas. Pro piaghere torra a compidare intre pagu." + following: "Impostatziones de cumpartzidura" + liked: "a calicunu agradat una publicatzione tua" + mentioned: "ses numenadu in una publicatzione" + new_password: "Crae noa" + private_message: "as retzidu unu messàgiu privadu" + receive_email_notifications: "Retzi notìficas pro mèdiu de e-lìteras cando:" + reshared: "calicunu at cumpartzidu una publicatzione tua" + show_community_spotlight: "Ammustra \"in evidèntzia in sa comunidade\" in su flussu tuo" + show_getting_started: "Ammustra sa ghia initziale" + started_sharing: "calicunu at incumintzadu a cumpartzire cun tie" + stream_preferences: "Preferèntzias pro su flussu" + your_email: "S'indiritzu de posta eletrònica tuo" + your_handle: "S'ID diaspora* tuo" + getting_started: + awesome_take_me_to_diaspora: "Fantasticu! Faghe·mi intrare in diaspora*" + community_welcome: "Sa comunidade de diaspora* est cuntenta de ti tènnere a bordu cun nois!" + connect_to_facebook: "Podimus fàghere in manera unu pagu prus lestra impreende %{link} a diaspora*. Gasi as a carrigare su nùmene e sa fotografia tua, e as a abilitare sa cumpartzidura de sas publicatziones." + connect_to_facebook_link: "Su collegamentu de su contu tuo de Facebook" + hashtag_explanation: "Sos cantzelletos ti permitint de chistionare de sos interessos tuos e de los sighire. Sunt fintzas una manera ispantosa de connòschere gente noa in diaspora*." + hashtag_suggestions: "Proa a sighire etichetas comente a #art, #movies, #gif, etz." + well_hello_there: "Salude!" + what_are_you_in_to: "Cales sunt sos interessos tuos?" + who_are_you: "Chie ses tue?" + privacy_settings: + ignored_users: "Impreadores ignorados" + stop_ignoring: "Acaba·la de l'ignorare" + title: "Impostatziones pro sa privadesa" + public: + does_not_exist: "S'impreadore %{username} no esistit!" + update: + email_notifications_changed: "Notìficas pro mèdiu de p. eletrònica modificadas" + follow_settings_changed: "Impostatziones pro sa sighidura cambiadas" + follow_settings_not_changed: "Modìfica de sas impostatziones de sighidura fallida." + language_changed: "Limba cambiada" + language_not_changed: "Càmbiu de sa limba fallidu" + password_changed: "Crae cambiada. Como podes intrare in su contu tuo cun sa crae noa." + password_not_changed: "Càmbiu de sa crae fallidu" + settings_not_updated: "Agiornamentu de sas impostatziones fallidu" + settings_updated: "Impostatziones agiornadas" + unconfirmed_email_changed: "Indiritzu de posta eletrònica cambiadu. Tenet bisòngiu de èssere ativadu." + unconfirmed_email_not_changed: "Modìfica de s'indiritzu de posta eletrònica fallida" + will_paginate: + next_label: "imbeniente »" + previous_label: "« antepostu" \ No newline at end of file diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml index 225dec5ba..8e7a18984 100644 --- a/config/locales/diaspora/sk.yml +++ b/config/locales/diaspora/sk.yml @@ -266,7 +266,6 @@ sk: mentions: how_to_mention_a: "Napíš znak \"@\" pred meno toho človeka (bez medzery). Malo by sa zobraziť rolovacie menu, aby si si mohol (-hla) ľahšie vybrať. Pamätaj si, že takto môžeš spomenúť iba ľudí, ktorých máš pridaných do kategórií." how_to_mention_q: "Ako môžem niekoho spomenúť, keď píšem príspevok?" - mention_in_comment_a: "Nie, nie v súčasnosti." mention_in_comment_q: "Môžem niekoho spomenúť v komentári?" title: "Zmienky" what_is_a_mention_a: "Zmienka je odkaz na niečiu stránku s profilom, ktorý sa objaví v príspevku. Keď niekoho spomeniete, dostane oznam, ktorý upriami jeho pozornosť na príspevok." @@ -281,25 +280,15 @@ sk: character_limit_a: "65 535 znakov. To je o 65 395 znakov viac, ako Ti dá Twitter! ;)" character_limit_q: "Aký je limit znakov pre príspevok?" format_text_q: "Ako môžem formátovať text v mojom príspevku (hrúbku, kurzíva, atď.)?" - image_text: "text k obrázku" - image_url: "adresa obrázka" insert_images_comments_q: "Môžem vložiť obrázok do komentáru?" insert_images_q: "Ako môžem vložiť obrázok do príspevku?" size_of_images_q: "Môžem upraviť veľkosť obrázku v príspevku alebo komentári?" title: "Príspevky a ich posielanie" private_posts: title: "Súkromné príspevky" - private_profiles: - title: "Súkromné profily" - whats_in_profile_q: "Čo obsahuje môj súkromný profil?" - who_sees_profile_q: "Kto vidí môj osobný profil?" public_posts: find_public_post_q: "Ako môžu ľudia nájsť môj verejný príspevok?" title: "Verejné príspevky" - public_profiles: - title: "Verejné profily" - whats_in_profile_q: "Čo je môj verejný profil?" - who_sees_profile_q: "Kto vidí môj verejný profil?" sharing: title: "Zdieľanie" tags: diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index 9c9ebe8f3..01c5a8149 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -409,7 +409,6 @@ sv: mentions: how_to_mention_a: "Skriv ett snabel-a innan du skriver personens namn. En meny borde då dyka upp med dina kontakter i, för att hjälpa dig att nämna rätt person. Observera att du bara kan nämna personer som finns i någon av dina aspekter." how_to_mention_q: "Hur nämner jag någon när jag skriver ett inlägg?" - mention_in_comment_a: "Nej, inte i nuläget." mention_in_comment_q: "Kan jag @nämna någon i en kommentar?" see_mentions_a: "Ja. Tryck på \"@Omnämnanden\" i vänstra kolonnen på din sida." see_mentions_q: "Är det möjligt för mig att se inlägg jag nämnts i?" @@ -445,11 +444,7 @@ sv: format_text_q: "Hur kan jag formatera texten i mina inlägg? (Fet stil, kursivera, etcetera.)" hide_posts_a: "Om du pekar muspekaren överst på ett inlägg kommer ett kryss att dyka upp till höger. Tryck på det för att dölja inlägget och avsluta notifieringarna berörande det. Du kommer fortfarande kunna se inlägget om du besöker författarens profilsida." hide_posts_q: "Hur döljer jag ett inlägg?" - image_text: "bildtext" - image_url: "bild-url" insert_images_a: "Tryck på den lilla kameraikonen för att bifoga en bild till inlägget. Tryck på ikonen igen för att lägga till fler foton. Du kan välja fler att ladda upp flera bilder samtidigt" - insert_images_comments_a1: "Du kan inte ha bilder i kommentarer, men med följande kodrad" - insert_images_comments_a2: "används för att lägga till bilder från en webbplats till både kommentarer och inlägg." insert_images_comments_q: "Kan jag lägga till bilder i kommentarer?" insert_images_q: "Hur lägger jag in bilder till mitt inlägg?" post_location_a: "Tryck på knappnålsikonen bredvid kameran där du laddar upp bilder. Det här kommer att lägga till din plats från OpenStreetMap.org. Du själv kan ändra platsen, för att bara ange staden du befinner dig i och inte den exakta adressen." @@ -478,14 +473,6 @@ sv: title: "Privata inlägg" who_sees_post_a: "Bara personer som är inloggade på Diaspora*, och som du har i en aspekt, kan se dessa privata inlägg." who_sees_post_q: "Vem kan se mitt inlägg till en aspekt, alltså ett privat inlägg?" - private_profiles: - title: "Privata profiler" - whats_in_profile_a: "Biografi, plats, kön och födelsedag; om du angivit dessa. De finns längst ned på profilredigeringssidan. All information är frivillig – det är du som bestämmer vad som skall fyllas i. Inloggade personer i dina aspekter är de enda som kan se din privata profil. De kommer också att se privata inlägg som du skrivit till den aspekten eller de aspekterna som du lagt till dem i. När de besöker din profilsida syns dem bland dina publika inlägg." - whats_in_profile_q: "Vad finns i min privata profil?" - who_sees_profile_a: "Alla inloggade användare som du har i en aspekt skulle kunna se din privata profil. Personer som följer dig, men du inte följer, kan däremot se din publika information." - who_sees_profile_q: "Vilka ser min privata profil?" - who_sees_updates_a: "Personerna i dina aspekter ser ändringarna du gör till din profil. " - who_sees_updates_q: "Vilka ser dem uppdateringar jag gör till min privata profil?" public_posts: can_comment_reshare_like_a: "Bara de som är inloggade på Diaspora* kan kommentera, dela vidare och gilla dina offentliga inlägg." can_comment_reshare_like_q: "Vilka kan kommentera, dela och gilla mina publika inlägg?" @@ -498,16 +485,6 @@ sv: title: "Publika inlägg" who_sees_post_a: "Vem som helst med en Internetuppkoppling kan potentiellt se dina publika inlägg. Var därför noga med att du verkligen vill att dina publika inlägg skall vara publika. Det är bra sätt komma i kontakt med resten av världen." who_sees_post_q: "Vilka ser de publika inlägg som jag gör?" - public_profiles: - title: "Publika profiler" - what_do_tags_do_a: "Taggarna hjälper andra att lära känna dig. Din profilbild kommer också att synas till på taggarnas sida, tillsammans med alla andra som har dessa taggar på sin sida." - what_do_tags_do_q: "Vad gör taggarna på min publika profilsida?" - whats_in_profile_a: "Ditt namn, de fem taggarna du beskrivit dig med och din profilbild. De ändras i den övre delen på profilinställningssidan. Du kan själv välja hur publik du vill att informationen på din profilsida ska vara. Din profilsida visar även alla de offentliga inlägg du har gjort." - whats_in_profile_q: "Vad syns i min publika profil?" - who_sees_profile_a: "Alla som besöker din sida kan se den, oavsett om de är inloggade på Diaspora* eller inte. Varje profil har en direktlänk så att man kan länka till den direkt från andra sidor. Sökmotorer kan indexera din profilsida." - who_sees_profile_q: "Vilka ser min publika profil?" - who_sees_updates_a: "Alla kan se ändringarna du gör, givet att de besöker din sida." - who_sees_updates_q: "Vilka ser uppdateringar av min offentliga profilsida?" resharing_posts: reshare_private_post_aspects_a: "Nej, det är inte möjligt att dela vidare privata inlägg. Med hänsyn för upphovspersonen, kan inlägget bara ses av dem personen själv vill." reshare_private_post_aspects_q: "Kan jag dela vidare privata inlägg till specifika aspekter?" diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml index 9f517d98c..8bfb6a7f6 100644 --- a/config/locales/diaspora/te.yml +++ b/config/locales/diaspora/te.yml @@ -298,7 +298,6 @@ te: markdown: "మార్క్డౌన్" mentions: how_to_mention_q: "నేను పోస్టు చేసేటప్పుడు ఎవరినైనా పేర్కొనడం ఎలా?" - mention_in_comment_a: "లేదు, ప్రస్థుతం వీలుకాదు." mention_in_comment_q: "వ్యాఖ్యలో ఎవరినైనా నేను పేర్కొనవచ్చా?" title: "పేర్కోలు" what_is_a_mention_q: "“పేర్కొలు” అంటే ఏమిటి?" @@ -310,8 +309,6 @@ te: posts_and_posting: character_limit_q: "టపాలకు అక్షరాల పరిమితి ఎంత?" hide_posts_q: "ఒక పోస్టును దాయడం ఎలా?" - image_text: "బొమ్మ పాఠ్యం" - image_url: "బొమ్మ url" insert_images_comments_q: "వ్యాఖ్యలలో బొమ్మలను పెట్టడం ఎలా?" insert_images_q: "జాబులలో బొమ్మలను పెట్టడం ఎలా?" post_location_q: "టపాలకు నా ప్రాంతాన్ని ఎలా చేర్చవచ్చు?" @@ -320,23 +317,10 @@ te: can_comment_q: "నా రహస్య టపాలను ఎవరు ఇష్టపడవచ్చు లేదా వ్యాఖ్యలను ఉంచవచ్చు?" can_reshare_q: "నా రహస్య టపాలను ఎవరెవరు తిరిగి పంచుకోగలరు?" title: "అంతరంగిక టపాలు" - private_profiles: - title: "రహస్య ప్రవరలు" - whats_in_profile_q: "నా రహస్య ప్రవరలో ఏమేమి ఉంటుంది?" - who_sees_profile_q: "నా రహస్య ప్రవరను ఎవరెవరు చూడగలరు?" - who_sees_updates_q: "నా రహస్య ప్రవర తాజాకరణలను ఎవరెవరు చూస్తారు?" public_posts: find_public_post_q: "నా బహిరంగ టపాలను ఇతరులు ఎలా కనుగొనగలరు?" title: "బహిరంగ టపాలు" who_sees_post_q: "నేను ఏదైనా బహిరంగంగా ప్రచురించినపుడు, దాన్ని ఎవరు చూడగలరు?" - public_profiles: - title: "బహిరంగ ప్రవరలు" - what_do_tags_do_a: "మీ గురించి తెలుసుకోవడానికి వ్యక్తులకు ఉపయోగపడతాయి. ఎవరైతే కొసలను వారి బహిరంగ ప్రవరలో కలిగివున్నారో వారు మరియు ఆయా నిర్దిష్ట కొస పుటలలో ఎడమవైపు మీ ప్రవర చిత్రం కూడా కనిపిస్తుంది." - what_do_tags_do_q: "నా బహిరంగ ప్రవరపై ఉన్న కొసలు ఏమి చేస్తాయి?" - whats_in_profile_q: "నా బహిరంగ ప్రవరలో ఏముంటుంది?" - who_sees_profile_q: "నా బహిరంగ ప్రవరను ఎవరు చూడగలరు?" - who_sees_updates_a: "మీ ప్రవర పుటను సందర్శించిన వారు ఎవరైనా చూడగలరు." - who_sees_updates_q: "నా బహిరంగ ప్రవర తాజాకరణలను ఎవరెవరు చూడగలరు?" resharing_posts: title: "టపాలను మళ్ళీ పంచుకొనుట" sharing: diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml index cde3970a0..4aa106506 100644 --- a/config/locales/diaspora/tr.yml +++ b/config/locales/diaspora/tr.yml @@ -179,6 +179,12 @@ tr: heading: "Diaspora yer işareti" post_something: "Diaspora için bir şey gönder" cancel: "İptal Et" + color_themes: + dark_green: "Koyu yeşil" + egyptian_blue: "Mısır mavisi" + magenta: "Macenta" + original: "Asıl gri" + original_white: "Asıl beyaz arkaplan" comments: new_comment: comment: "Yorum yaz" @@ -284,7 +290,6 @@ tr: mentions: how_to_mention_a: "@ yazın ve kullanıcının adını yazmaya başlayın. Açılır menü, seçiminizi kolaylaştırmak üzere belirecektir. Yalnızca bir bakışa eklediğiniz kişiden bahsedebilirsiniz." how_to_mention_q: "Gönderi yaparken birisini nasıl anabilirim?" - mention_in_comment_a: "Hayır, henüz değil." mention_in_comment_q: "Bir yorumun içinde birisini anabilir miyim?" see_mentions_a: "Evet. Ana sayfanızın sol sütunundaki \"Anılmalar\"ı tıklayın." see_mentions_q: "Benim anıldığım gönderileri görmenin bir yolu var mı?" @@ -315,10 +320,7 @@ tr: format_text_q: "Gönderilerimi nasıl biçimlendirebilirim(kalın, İtalik, vs.)?" hide_posts_a: "Fareyi gönderinin üzerinde getirdiğinizde sağ tarafta X belirir. Ona tıkladığınızda gönderiyi gizleyip bildirimleri susturmuş olursunuz. Ancak bu, gönderenin profilini ziyaret ettiğinizde gönderiyi görmenizi engellemez." hide_posts_q: "Gönderilerimi nasıl gizlerim?" - image_text: "resim metni" - image_url: "resim url'si" insert_images_a: "Ufak kamera simgesine tıklayarak bunu yapabilirsiniz. Başka bir görüntü yüklemek için kamera simgesine tekrar tıklayabilir veya birden fazlasını tek seferde yükleyebilirsiniz." - insert_images_comments_a1: "Aşağıda not düşülen kod" insert_images_comments_q: "Yorumlara resim ekleyebilir miyim?" insert_images_q: "Gönderilere nasıl görüntü eklerim?" size_of_images_a: "Yapamazsınız. Resimler kendiliğinden akış genişliğine uyacak şekilde boyutlandırılırlar. Markdown içinde resim boyutunu belirleyecek bir kod yoktur." @@ -333,19 +335,8 @@ tr: can_reshare_a: "Hiç kimse. Özel gönderiler yeniden paylaşılamaz, ancak diaspora* nın kopyala-yapıştır koruması yoktur." can_reshare_q: "Özel gönderimi kim paylaşabilir?" title: "Özel gönderiler" - private_profiles: - title: "Özel profiller" - whats_in_profile_q: "Ne benim özel profil var?" - who_sees_profile_a: "Paylaşımda bulunduğunuz (bakışlarınızdan birinde olan) her hangi kullanıcı, adıyla girdiğinde görebilir. Ancak sizin takip etmediğiniz takipçiler, ancak herkese açık bilgilerinizi görür." - who_sees_profile_q: "Özel profilimi kimler görür?" - who_sees_updates_a: "Bakışlarınızdaki herkes özel profilinizdeki değişiklikleri görebilir. " - who_sees_updates_q: "Özel profilimin güncelllemelerini kim görebilir?" public_posts: title: "Genel gönderiler" - public_profiles: - title: "Genel profiller" - whats_in_profile_a: "Adınız, kendinizi tanımladığınız beş etiket, fotoğrafınız. Profili düzenleme sayfasının üstündeki şeyler. Profil bilgilerini tanımlanabilir ya da anonim olarak tanımlayabilirsiniz. Profil sayfası ayrıca tüm genel gönderilerinizi gösterir." - whats_in_profile_q: "Genel profilimin içinde ne var" resharing_posts: reshare_private_post_aspects_a: "Hayır, bu mümkün değildir. Böyle bir şey, gönderenin, yalnızca belirli bir kitle ile paylaşmak niyetine ters düşerdi." reshare_private_post_aspects_q: "Özel bir gönderiyi yeniden paylaşabilir miyim?" diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml index 05f558559..5260a79b8 100644 --- a/config/locales/diaspora/uk.yml +++ b/config/locales/diaspora/uk.yml @@ -288,6 +288,13 @@ uk: heading: "Інтерактивна закладка Діаспори" post_something: "Повідомлення до Діаспори" cancel: "Скасувати" + color_themes: + dark: "Темний" + dark_green: "Темно-зелений" + egyptian_blue: "Єгипетська синь" + magenta: "Маджента" + original: "Оригінальний синій" + original_white: "Оригінальний з білим тлом" comments: create: error: "Неможливо коментувати." @@ -395,9 +402,11 @@ uk: add_contact_roster_q: "Як я можу поспілкуватися з кимось у Діаспора?" contacts_page: "сторінка контактів" title: "Розмова" + community_guidelines: "правила спільноти" faq: "ЧаПи" foundation_website: "сайт Diaspora* Foundation" getting_help: + get_support_a_discourse: "Пошукайте наявні обговорення, що стосуються вашого питання, або започаткуйте нову тему на нашій платформі %{discourse}" get_support_a_faq: "Читайте нашу %{faq} сторінку у вікі" get_support_a_hashtag: "запитайте в публічному записі на Діаспорі*, використовуючи мітку %{question}" get_support_a_irc: "приєднуйтесь до нас в %{irc} або джаббер чаті diaspora@conference.dukgo.com" @@ -427,7 +436,7 @@ uk: mentions: how_to_mention_a: "Напишіть знак \"@\" та почніть набирати ім'я. З'явиться меню з вибором відповідних користувачів. Зауважте, що згадувати користувача можна тільки, якщо ви додали його у свої аспекти." how_to_mention_q: "Як мені згадати кого-небудь, коли я створюю запис?" - mention_in_comment_a: "Поки що ні." + mention_in_comment_a: "Починаючи з версії 0.7.0.0, так! Ви можете згадати когось у коментарі так само, як у дописі, написавши «@», а тоді ім'я. Будь ласка, зауважте, що коли коментуєте непублічний допис, то можна згадати лише тих користувачів, які якось відреагували на допис." mention_in_comment_q: "Чи можна згадати кого-небудь у коментарях?" see_mentions_a: "Так. Натисність кнопку \"@Упоминания\" у бічній панелі на вашій сторінці." see_mentions_q: "Чи є спосіб побачити список записів, у яких я згадуюсь?" @@ -463,11 +472,8 @@ uk: format_text_q: "Як мені оформити текст моїх записів (полужирний, курсив і т.д.)?" hide_posts_a: "Якщо Ви наведете мишкою на запис, справа вверху з'явиться хрестик. Натисніть на нього. Ви все одно зможете бачити запис і коментарі, якщо зайдете на сторінку до автора цього запису." hide_posts_q: "Як мені приховати запис і перестати отримувати повідомлення про коментарі до нього?" - image_text: "спливаючий текст" - image_url: "Адреса зображення" insert_images_a: "Натисність піктограму фотокамери та вкажіть потрібне зображення для завантаження з вашого комп'ютера. Якщо ж Ви бажаєте вставити зображення з Інтернету, то Ви можете скористатися синтаксисом Мarkdown." - insert_images_comments_a1: "Ви не можете завантажувати зображення в коментарі, але можете скористатись кодом Markdown" - insert_images_comments_a2: "може бути використаний як для коментарів, так і для записів." + insert_images_comments_a: "Ми можете використовувати Markdown, щоб вставити зображення з мережі у коментар, так само, як і в дописах. Однак прямо з комп'ютера завантажити зображення не можна. Закиньте їх на сервіс гостингу зображень, а тоді вставте, скориставшись кнопкою зображень." insert_images_comments_q: "Чи можу я додати зображення у коментарі?" insert_images_q: "Як мені додати у запис зображення?" post_location_a: "Натисніть на значок-булавку, поряд з камерою у вікні оформлення запису. Це добавить ваше місце розташування згідно OpenStreetMap. Ви можете відредагувати адресу, наприклад залишивши тільки місто, без вказівки вулиці." @@ -496,14 +502,14 @@ uk: title: "Приватні записи" who_sees_post_a: "Тільки залогінені користувачі Діаспори*, які були додані в цей аспект." who_sees_post_q: "Коли я створюю запис для аспекту (тобто приватний запис), хто його зможе бачити?" - private_profiles: - title: "Приватні профілі" - whats_in_profile_a: "Біографію, місцезнаходження, стать і день народження. Якщо, звичайно, ви вказали цю інформацію у налаштуваннях свого профілю. Сторінку побачать лише користувачі, яких ви додали у свої аспекти, які також побачать у стрічці крім публічних записів, ті приватні записи, якими ви поділились з цими аспектами." - whats_in_profile_q: "Що знаходиться в моєму приватному профілі?" - who_sees_profile_a: "Будь-який залогинений користувач Діаспори, якого ви додали у свої аспекти. Проте, люди, які додали вас, але яких не додали ви бачитимуть тільки публічну інформацію." - who_sees_profile_q: "Хто може бачити мій приватний профіль?" - who_sees_updates_a: "Будь-який користувач з ваших аспектів. " - who_sees_updates_q: "Хто побачить оновлення у моєму приватному профілі?" + profile: + title: "Профіль" + what_do_tags_do_a: "Допомагають іншим людям з вами познайомитися. Картинка вашого профілю також з'являтиметься ліворуч на сторінках стрічок цих міток, поруч з іншими, хто використовує їх у своєму публічному профілі." + what_do_tags_do_q: "Що роблять мітки в моєму основному профілі?" + whats_in_profile_a: "Ваш профіль складається з двох частин: основний профіль і розширений. До вашого основного профілю належить ім'я, п'ять міток, якими ви себе представляєте, і фото. Ваш розширений профіль містить біографію, розташування, стать та дату народження. Уся ця інформація необов'язкова: від вас залежить, чи надавати її, і свій профіль можна зробити так впізнаваним чи анонімним, як ви хочете. Розширений профіль показується у лівій колонці сторінки профілю, під картинкою профілю." + whats_in_profile_q: "Що є в моєму профілі" + who_sees_profile_a: "Ваш основний профіль (ім'я, зображення і #мітки) — публічний. Ваш розширений профіль за замовчуванням приватний, але за бажання його можна зробити публічно доступним. Лише люди, з якими ви ділитеся (тобто ви додали їх до одного з аспектів), можуть бачити ваш розширений профіль, якщо він приватний. Інші люди бачать лише публічну інформацію. Будь-яку інформацію, яку ви робите публічною, може переглянути будь-хто в мережі, і вона також індексується пошуковиками" + who_sees_profile_q: "Хто бачить мій профіль?" public_posts: can_comment_reshare_like_a: "Будь-який зареєстрований користувач Діаспори*." can_comment_reshare_like_q: "Хто може коментувати мої публічні записи, ділитися або відмічати як вподобані?" @@ -516,16 +522,6 @@ uk: title: "Публічні записи" who_sees_post_a: "Всі інтернет користувачі можуть побачити запис, який ви зробили публічним. Так що перевірте - чи дійсно ви хочете цього. З іншого боку це непоганий спосіб поділитися зі всім світом." who_sees_post_q: "Хто може бачити мої публічні записи?" - public_profiles: - title: "Публічні профілі" - what_do_tags_do_a: "Вони допомагають людям пізнати Вас. Ваш аватар також буде відображатись у списку зліва серед інших людей, які використовували цю позначку в їх публічних профілях." - what_do_tags_do_q: "Для чого потрібні позначки у моєму публічному профілі?" - whats_in_profile_a: "Ваше ім'я, п'ять позначок, які Ви вибрали, щоб описати себе, аватар і стрічка ваших публічних записів. Ви можете зробити цю інформацію настільки особистою або настільки анонімною, наскільки захочете." - whats_in_profile_q: "Що містить сторінка публічного профілю?" - who_sees_profile_a: "Будь-який користувач Діаспори* а також інтернету може побачити це. У кожного профілю є пряме посилання, яке можна вказувати на зовнішніх сайтах.Також публічні профілі індексуються пошуковими системами." - who_sees_profile_q: "Хто бачить мій публічний профіль?" - who_sees_updates_a: "Будь-який користувач мережі Internet, відвідуючий вашу сторінку." - who_sees_updates_q: "Хто бачить оновлення в моєму публічному профілі?" resharing_posts: reshare_private_post_aspects_a: "Ні. Ця функція відсутня з поваги до бажань автора запису, який поділився ним тільки з обмеженим колом людей." reshare_private_post_aspects_q: "Чи можу я поділитися приватним записом?" @@ -684,6 +680,7 @@ uk: mark_read: "Помітити як прочитане" mark_unread: "позначити як непрочитане" mentioned: "Згадав" + mentioned_in_comment: "Згадується у коментарі" no_notifications: "У Вас немає повідомлень." notifications: "Повідомлення" reshared: "Поділився" @@ -716,6 +713,16 @@ uk: one: "%{actors} згадали вас у вилученому записі." other: "%{actors} згадали вас у вилученому записі." zero: "%{actors} згадали вас у вилученому записі." + mentioned_in_comment: + few: "%{actors} згадали Вас в коментарях до запису %{post_link}." + many: "%{actors} згадали Вас в коментарях до запису %{post_link}." + one: "%{actors} згадав Вас в коментарі до запису %{post_link}." + other: "%{actors} згадали Вас в коментарях до запису %{post_link}." + mentioned_in_comment_deleted: + few: "%{actors} згадали Вас у видалених коментарях." + many: "%{actors} згадали Вас у видалених коментарях." + one: "%{actors} згадав Вас у видаленому коментарі." + other: "%{actors} згадали Вас у видалених коментарях." private_message: few: "%{actors} надіслали вам повідомлення." many: "%{actors} надіслали вам повідомлення." @@ -849,6 +856,9 @@ uk: mentioned: limited_post: "Вас згадали в приватному записі." subject: "%{name} згадав вас у Діаспорі*" + mentioned_in_comment: + limited_post: "Ви були згадані в коментарі до приватного запису." + reply: "Відповісти або подивитися цю розмову>" private_message: reply_to_or_view: "Відповісти або подивитися цю бесіду >" subject: "Там нове ПП для Вас" @@ -1224,6 +1234,7 @@ uk: last_exported_at: "(Востаннє оновлено %{timestamp})" liked: "комусь подобається ваш запис" mentioned: "вас згадали у записі" + mentioned_in_comment: "вас згадали у коментарі" new_password: "Новий пароль" private_message: "ви отримали особисте повідомлення" receive_email_notifications: "Отримувати повідомлення електронною поштою, коли:" diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml index 1aea8e6ff..e8ed7b43c 100644 --- a/config/locales/diaspora/zh-TW.yml +++ b/config/locales/diaspora/zh-TW.yml @@ -267,6 +267,13 @@ zh-TW: heading: "書籤小程式" post_something: "貼到 diaspora*" cancel: "取消" + color_themes: + dark: "暗色系" + dark_green: "暗綠色" + egyptian_blue: "埃及藍" + magenta: "紫紅色" + original: "原始灰" + original_white: "原始白背" comments: create: error: "發表意見失敗。" @@ -342,7 +349,7 @@ zh-TW: data_visible_to_podmin_q: "我所在豆莢的管理員可以看到多少我的資料？" download_data_a: "可以的。在設定頁面的帳號頁籤的最下面，分別有兩個按鈕可以讓你下載個人資料和相片。" download_data_q: "我可以把豆子裡全部的資料都下載下來嗎？" - move_pods_a: "目前不行，未來我們會加入匯出匯入的功能，你就可以從某個豆莢匯出後，再從另一個豆莢匯入了。不過你還是可以開一個新的帳號以及裡面的社交面，然後把每一個聯絡人重加一次，請他們也重加你一次。" + move_pods_a: "0.7..0.0 版的 diaspora* 支援帳號移轉的第一個步驟: 你可以在使用者設定的「帳號」下匯出你的所有資料。請好好保管資料！你將可以在未來的版本中完全移轉你的帳號到其他的豆莢，保留之前的貼文和聯絡人。" move_pods_q: "要怎樣把我的豆子（帳號）搬到別的豆莢去呢？" title: "帳號與資料管理" aspects: @@ -350,7 +357,7 @@ zh-TW: change_aspect_of_post_q: "我可以在貼文之後更改它發表的社交面嗎？" contacts_know_aspect_a: "不知道。無論如何他們都看不到社交面的名稱。" contacts_know_aspect_q: "我的聯絡人知道我把他們放到哪些社交面中嗎？" - contacts_visible_a: 如果你對某個社交面打開這個選項，那麼其中的所有聯絡人都可以從你個人檔案的"聯絡人"頁籤看到其他人。最好是在該社交面中的所有人都彼此認識的情況下，才開啟這個選項，比如說是專屬於某個社團或你所屬社群的社交面。不過聯絡人並不會知道你把這個社交面叫什麼名字。 + contacts_visible_a: 如果你對某個社交面打開這個選項，那麼其中的所有聯絡人都可以從你個人檔案的"聯絡人"頁籤看到其他人。(不過，目前版本只有跟你在同一個豆莢的聯絡人才看得到。)最好是在該社交面中的所有人都彼此認識的情況下，才開啟這個選項，比如說是專屬於某個社團或你所屬社群的社交面。不過聯絡人並不會知道你把這個社交面叫什麼名字。 contacts_visible_q: "\"讓社交面中的聯絡人可以互相看見\"是什麼意思？" delete_aspect_a: 請從流水帳畫面的側邊欄點一下"我的社交面"，然後點一下你想刪掉的那個社交面旁邊的鉛筆圖示。或是到你的聯絡人畫面，點選你想刪掉的那一面。接著點一下頁面右上方的垃圾桶圖示就可以了。 delete_aspect_q: "要怎樣刪掉社交面？" @@ -374,9 +381,11 @@ zh-TW: add_contact_roster_q: "要怎樣在 diaspora* 跟某人即時聊天？" contacts_page: "聯絡人頁面" title: "即時聊天" + community_guidelines: "社群共識" faq: "常見問答" foundation_website: "diaspora* 基金會網站" getting_help: + get_support_a_discourse: "來我們的%{discourse}平台搜尋看看你的問題是否已經被討論過，或是開始一個新的討論串。" get_support_a_faq: "來看看我們在維基上的%{faq}頁面" get_support_a_hashtag: "公開用 %{question} 標籤在 diaspora* 上發問" get_support_a_irc: "來%{irc}加入我們（即時聊天）" @@ -406,7 +415,7 @@ zh-TW: mentions: how_to_mention_a: "先打 @ 符號再接著打名字，應該會出現一個下拉式選單讓你比較好選。要注意的是你只能提到那些在你的社交面中的人。" how_to_mention_q: "我在寫貼文時要怎樣提到某人？" - mention_in_comment_a: "目前還不行。" + mention_in_comment_a: "從 0.7.0.0 版開始就可以了！你可以在回應中提到某人，就像在貼文中一樣，只要先打 @ 符號再接著名字就可以了。請注意，如果你回應的是非公開的貼文，就只能夠指指點點已經跟該貼文互動的人。" mention_in_comment_q: "我可以在留言中提到某人嗎？" see_mentions_a: 可以，請點首頁左手邊的"@指指點點"。 see_mentions_q: "有辦法看到所有我被提到的貼文嗎？" @@ -427,7 +436,7 @@ zh-TW: find_people_a: "你可以用側邊欄的邀請或電子郵件連結，來邀請你的朋友一起加入 diaspora*。你也可以用追蹤 #標籤 來尋找志同道合的人，這樣當他們發表了你有興趣的貼文時，你就可以將他們加進你的社交面。公開貼文大喊你是 #新來的 也行。" find_people_q: "我剛剛加入一個豆莢，要怎樣找到其它可以分享的人？" title: "豆莢" - use_search_box_a: "如果你知道他們的 diaspora* 識別碼全寫的話(比方說像是 username@podname.org)，直接搜尋識別碼就可以了。如果你們在同一個豆莢裡，可以用他們的使用者名稱搜尋。不然就用他們的檔案名字(也就是畫面上看到的名字)搜尋看看。如果第一次搜尋不到，就再重試一次看看。" + use_search_box_a: "你可以用使用者名稱或是 diaspora* 名稱(也就是檔案上看到的名字)來搜尋他們。如果都沒有的話，就改用完整的 diaspora* 識別碼(像是 username@podname.org)搜尋。第一次搜尋可能會因為網路延遲而搜尋不到，可以再重試一次看看。" use_search_box_q: "要怎樣用搜尋框框找到特定的人？" what_is_a_pod_a: "豆莢是一台伺服器，上面跑了 diaspora* 軟體，和整個 diaspora* 網路相連接。用\"豆莢\"這一個詞，是在比喻伺服器上包含了許多使用者的帳號，就有如植物的豆莢包含了許多豆子一樣。網路上會有許許多多的豆莢。你可以加位於其它豆莢的朋友，好跟他們交流。你不需要在每個豆莢都註冊，只要有一個帳號就夠了！你也可以想像 diaspora* 豆莢就好像電子郵件的信箱一樣：有公開供應的，也有私人專屬的，甚至如果你肯下功夫，也可以維護自己的信箱或豆莢。" what_is_a_pod_q: "什麼是豆莢？" @@ -438,24 +447,21 @@ zh-TW: character_limit_q: "貼文的字數上限是多少？" embed_multimedia_a: "通常只要在你的貼文中貼影片或音訊的網址(比如說: http://www.youtube.com/watch?v=nnnnnnnnnnn)，就會自動嵌入了。支援的網站有: YouTube, Vimeo, SoundCloud, Flickr 等等。diaspora* 用 oEmbed 機制來提供這個功能。我們會陸續支援更多的媒體來源網站。請記得一定要貼完整的的網址，而不是縮短過的，也不要有多餘的控制參數。貼完後要看預覽畫面的話，請先等一段時間再重新載入頁面。" embed_multimedia_q: "要怎樣在貼文中嵌入一段影片、音訊、或是其他多媒體作品？" - format_text_a: "用一種叫%{markdown}的簡化寫法，在%{here}有完整的格式說明。\"預覽\"按鈕可以讓你在分享出去之前，先知道貼文看起來會是什麼樣子，真的很有用。" + format_text_a: "diaspora* 用一種叫%{markdown}的簡化排版系統。發表對話框上有一些按鈕可以幫助排版。如果你想要自己手動排版的話，在%{here}有完整的格式說明。\"預覽\"分頁可以讓你在分享出去之前，先知道貼文看起來會是什麼樣子。要知道貼文後是不能再修改的，所以在分享出去之前，請用預覽來確定它完美無瑕！" format_text_q: "要怎樣對我的貼文加格式(比如說加粗、推斜等等)?" hide_posts_a: "當你把滑鼠游標放在一篇貼文上面時，右邊會出現一個 X 圖示。點那個圖示就可以把貼文隱藏起來，也不會再收到關於它的通知。你還是可以到作者的個人檔案去找到那篇貼文。" hide_posts_q: "要怎樣隱藏一篇貼文？" - image_text: "圖片說明" - image_url: "圖片網址" - insert_images_a: "按那個照相機的小圖示就可以選一張要放到貼文裡的圖片。再按一次就可以再加一張相片，或是一次同時選好幾張相片也可以。" - insert_images_comments_a1: "你不能上傳圖片到留言裡面，但是貼文和留言都可以用以下的 Markdown 語法:" - insert_images_comments_a2: "來顯示在網路上的圖片。" + insert_images_a: "如果你想要在貼文中加一張存在電腦上的圖片，請按發表對話框下方的那個照相機小圖示。也可以拖放一張或多張的圖片到那個圖示上。如果你想要加入一張網路(web)上的圖片，請按發表對話框上方的圖片按鈕，就會產生對應的 Markdown 代碼。" + insert_images_comments_a: "你可以在回應時用 Markdown 加入網路上的圖片，就像是在貼文時一樣。不過，你不能直接加入在你的電腦上的圖片。替代方案是：先將圖片上傳到其他相簿網站，然後用發表對話框上方的圖片按鈕來加入連結。" insert_images_comments_q: "我可以在留言中放圖片嗎？" insert_images_q: "要怎樣把圖片放到貼文裡面？" - post_location_a: "按一下發表對話盒的別針圖示，就在相機的旁邊。這樣會把你的所在位置用 OpenStreetMap 加到貼文去。你也可以編輯你的位置，比如說你可能只想要標那個城市，而不是完整的地址。" + post_location_a: "按一下發表對話框的別針圖示，就在相機的旁邊。這樣會把你的所在位置用 OpenStreetMap 加到貼文去。你也可以編輯你的位置，比如說你可能只想要標那個城市，而不是完整的地址。" post_location_q: "要怎樣把我的所在位置加到貼文去？" post_notification_a: "你可以在貼文的右上角看到一個鈴鐺的圖示，點這個圖示就可以打開或關掉該篇貼文的活動通知。" post_notification_q: "要怎樣收到或停止收到某一篇貼文的活動通知？" post_poll_a: "點圖表那個圖示就可以產生一場投票。你要打題目以及至少兩個選項。如果想要任何人都能參加你的投票的話，別忘了要公開你的貼文。" post_poll_q: "要怎樣加一場投票到貼文裡？" - post_report_a: "點一下貼文右上角的三角警告圖示就可以投訴給你的莢主。請在對話盒中輸入投訴的理由。" + post_report_a: "點一下貼文右上角的三角警告圖示就可以投訴給你的莢主。請在對話盒中輸入投訴的理由。只有在貼文違反%{community_guidelines}或是豆莢的使用條款時才投訴它，比如說包含違法內容、濫用、或是大量廣告。" post_report_q: "要怎樣投訴某一篇貼文涉及人身攻擊呢？" size_of_images_a: "不行。圖片會根據目前是流水帳或單一貼文的版面來自動調整大小。Markdown 並沒有設定圖片大小的語法。" size_of_images_q: "我可以設定貼文或留言中的圖片大小嗎？" @@ -475,19 +481,19 @@ zh-TW: title: "非公開貼文" who_sees_post_a: "只有在你發表該篇非公開貼文前，就已經在那個社交面中的使用者才可以看得到，並且必須要在登入 diaspora* 的狀態下。" who_sees_post_q: "當我貼文到某個社交面時(也就是貼一篇非公開貼文)，有誰可以看得到？" - private_profiles: - title: "私人檔案" - whats_in_profile_a: "私人檔案裡面可以有自傳、所在地、性別、還有生日。你可以選擇要提供哪些給人看，沒有一項是必需要填的。只有那些你把他們加到社交面中的人，在登入的狀態下可以看到你的私人檔案。當他們看你的個人檔案時，除了你的公開貼文之外，還可以看到他們所屬社交面的非公開貼文。" - whats_in_profile_q: "私人檔案裡面有什麼？" - who_sees_profile_a: "任何你有跟他們分享的人(也就是那些你把他們加到社交面中的人)都可以。那些有追蹤你，但是你沒有追蹤他們的人，只能夠看到你的公開檔案。" - who_sees_profile_q: "誰看得到我的私人檔案？" - who_sees_updates_a: "任何在你的社交面中的人都可以看得到你私人檔案的改變。" - who_sees_updates_q: "我的私人檔案更新時，誰可以看得到？" + profile: + title: "個人檔案" + what_do_tags_do_a: "這些標籤可以幫助人們了解你。這些標籤的標籤流水帳的左手邊也會顯示你和其他人的個人照，你們的共同點就是基本檔案裡包含了該標籤。" + what_do_tags_do_q: "基本檔案裡的標籤有什麼用途？" + whats_in_profile_a: "個人檔案有兩個部份：基本檔案和進階檔案。基本檔案包含了名字、描述你自己的五個標籤、以及你的相片。進階檔案則包含了自傳、所在地、性別、還有生日。這些資料都不是必填的，要不要提供隨你高興，內容是要很容易看出來是你本人，還是要神神秘秘都可以。進階檔案會顯示在個人檔案頁面的左手邊 、個人照的下方位置。" + whats_in_profile_q: "個人檔案裡面有什麼？" + who_sees_profile_a: "你的基本檔案(名字、個人照、和 #標籤)是公開的。進階檔案則預設是不公開的，但是你想的話也可以開放給大家看。如果維持不公開的話，只有你有跟他們分享的人(也就是那些你把他們加到社交面中的人)才能看見。其他人只能看到你的公開資訊。任何一個網路(web)使用者都能夠看到你開放出來的所有檔案資料，也可能被搜尋引擎建檔使用。" + who_sees_profile_q: "誰看得到我的個人檔案？" public_posts: - can_comment_reshare_like_a: "任何 diaspora* 的使用者在登入狀態下都可以對你的公開貼文留言、轉貼、或是按讚。" + can_comment_reshare_like_a: "任何 diaspora* 的使用者在登入狀態下都可以對你的公開貼文留言、轉貼、或是按讚。被你忽視的人是例外，他們不能對你的貼文按讚或留言。" can_comment_reshare_like_q: "誰可以對我的公開貼文留言、轉貼、或是按讚？" - deselect_aspect_posting_a: "沒有影響，它還是一篇公開貼文，還是會出現在你的所有聯絡人的流水帳裡。如果只想讓某些面看到該篇貼文，你必須要在發表時點選那些面。" - deselect_aspect_posting_q: "我在發表公開貼文時，不選某個或某些面會有什麼影響？" + deselect_aspect_posting_a: "沒有影響，它還是一篇公開貼文，還是會出現在你的所有聯絡人的流水帳裡。如果只想讓某些面看到該篇貼文，你必須要在發表對話框下方點選那些面。" + deselect_aspect_posting_q: "我在發表公開貼文時，不選左手邊的某個或某些社交面會有什麼影響？" find_public_post_a: "追蹤你的人會在他們的流水帳看到。如果你在貼文中加了 #標籤 ，那麼任何追蹤該標籤的人都會在他們的流水帳看到。每一篇公開貼文都有專屬的網址，讓任何人不用登入都可以用那個網址看到。因此，公開貼文的連結可以直接貼到 Twitter、部落格、或是其他地方去。公開貼文也有可能會被搜尋引擎收集並編入索引。" find_public_post_q: "其他人要怎樣找到我的公開貼文？" see_comment_reshare_like_a: "公開貼文的留言、稱讚、或是轉貼，也都是公開的。任何登入 diaspora* 的使用者，以及其他使用網際網路的人，都可以看到你對該篇貼文的參與。" @@ -495,16 +501,6 @@ zh-TW: title: "公開貼文" who_sees_post_a: "任何用網際網路的人都有可能看到你公開的貼文，因此請務必確定你希望該貼文要公開出去。這是一個和世界溝通的好方法。" who_sees_post_q: "當我公開貼文時，誰可以看得到？" - public_profiles: - title: "公開檔案" - what_do_tags_do_a: "幫助別人了解你。另外，在這些標籤的專頁的左側也會秀你和其他檔案中有該標籤的人的個人照。" - what_do_tags_do_q: "個人檔案裡的標籤有什麼用？" - whats_in_profile_a: "你的公開檔案可能包含了你的名字、描述你自己的五個標籤、以及你的相片。你可以選擇要提供哪些給別人看，沒有一項是必須要填的。隨你高興要讓它一眼就知道是你，還是完全認不出來是誰。你的個人檔案也會顯示你發表過的公開貼文。" - whats_in_profile_q: "公開檔案的內容有什麼？" - who_sees_profile_a: "任何在登入狀態下的 diaspora* 使用者，以及廣大的網際網路世界，都可以看到。每個個人檔案都有一個網址，透過這個網址其他外部網站可以直接連結該檔案。公開檔案也有可能被搜尋引擎收集並編入索引。" - who_sees_profile_q: "誰會看到我的公開檔案？" - who_sees_updates_a: "任何來看你的個人檔案頁面的人都可以。" - who_sees_updates_q: "誰會看到我的公開檔案的更新？" resharing_posts: reshare_private_post_aspects_a: "不行，非公開貼文是不能轉貼的。這是為了要尊重原作者的意願，因為她/他只想跟特定的一群人分享。" reshare_private_post_aspects_q: "我可以轉貼一篇非公開貼文到特定的社交面嗎？" @@ -523,7 +519,7 @@ zh-TW: add_to_aspect_li7: 春嬌會出現在志明聯絡人頁面中的"跟我分享的人"裡面。 add_to_aspect_li8: "春嬌也開始可以在貼文裡 @指指點點 志明。" add_to_aspect_q: "當我把某人加進某個社交面，或是當某人把我加進她/他的某一面時，會發生什麼事？" - list_not_sharing_a: "沒有，但是你可以看某人的個人檔案來檢查她/他是否有跟你分享。如果有的話，社交面的按鈕會顯示你所加她/他的那個或那些面；如果沒有的話，按鈕會是灰色的。" + list_not_sharing_a: "沒有，但是你可以看某人的個人檔案，來檢查她/他是否有跟你分享。如果有的話，她/他的 diaspora* 識別碼旁邊會有一個綠色的勾勾；如果沒有的話，則會是灰色圈圈。" list_not_sharing_q: "是否有我把他們加進某一個社交面，但是他們卻沒有加我的聯絡人清單呢？" only_sharing_a: 這些人已經把你加進他們的社交面了，但是你的社交面中還沒有他們。也就是說他們有跟你分享，但是你卻(還)沒有跟他們分享，就好像是他們在追蹤你。如果你把他們加進任何社交面，他們就會出現在那一面的清單中，而不會在"跟我分享的人"裡面了。請看上面的說明。 only_sharing_q: 聯絡人頁面中有"跟我分享的人"，出現在裡面的人是誰？ @@ -535,7 +531,7 @@ zh-TW: tags: filter_tags_a: "目前 diaspora* 還不能直接這麼做，但是某些%{third_party_tools}可能有提供這個功能。" filter_tags_q: "要怎樣在我的流水帳過濾(排除)掉某些標籤？" - followed_tags_a: "搜尋一個標籤之後，你可以在標籤專頁的上方按\"追蹤\"按鈕來追蹤它。這樣一來，該標籤就會出現在左手邊追蹤中標籤的選單裡面。點任何一個你追蹤中的標籤會帶你到該標籤的專頁，讓你看到有該標籤的最新貼文。如果是點 #追蹤中的標籤 看到的會是你追蹤的所有標籤的流水帳。" + followed_tags_a: "搜尋一個標籤之後，你可以在標籤專頁的上方按\"追蹤\"按鈕來追蹤它。這樣一來，該標籤就會出現在左手邊追蹤中標籤的選單裡面。點任何一個你追蹤中的標籤會帶你到該標籤的專頁，讓你看到有該標籤的最新貼文。如果是點 #追蹤中的標籤 看到的會是你追蹤的所有標籤的流水帳。你的主要流水帳也會有包含該標籤的貼文。" followed_tags_q: "什麼是\"#追蹤中的標籤\"？要怎麼追蹤一個標籤？" people_tag_page_a: "是那些在他們的公開檔案放該標籤的人。" people_tag_page_q: "標籤專頁左手邊列出來的人是誰？" @@ -651,7 +647,8 @@ zh-TW: mark_all_shown_as_read: "把目前顯示的都標示成讀過了" mark_read: "標示為看過了" mark_unread: "標示為沒看過" - mentioned: "被提到了" + mentioned: "在貼文中被提到了" + mentioned_in_comment: "被貼文意見提到了" no_notifications: "目前還沒有任何通知。" notifications: "通知" reshared: "被轉貼" @@ -665,11 +662,15 @@ zh-TW: other: "%{actors} 稱讚了你刪掉的貼文。" zero: "%{actors} 稱讚了你刪掉的貼文。" mentioned: - other: "%{actors} 在貼文%{post_link}中提到了你" + other: "%{actors} 在貼文%{post_link}中提到了你。" zero: "%{actors} 在貼文%{post_link}中提到了你" mentioned_deleted: other: "%{actors} 在已刪掉的貼文中提到了你。" zero: "%{actors} 在已刪掉的貼文中提到了你。" + mentioned_in_comment: + other: "%{actors} 在貼文%{post_link}的意見中提到了你。" + mentioned_in_comment_deleted: + other: "%{actors} 在已刪掉的貼文中提到了你。" private_message: other: "%{actors} 送訊息給你。" zero: "%{actors} 送訊息給你。" @@ -754,7 +755,7 @@ zh-TW: message: |- 你好！ - %{diaspora_id} 邀請你加入 diaspora* 囉！ + %{user} 邀請你加入 diaspora* 囉！ 請按這個連結來開始使用吧： @@ -762,6 +763,7 @@ zh-TW: 如果你已經有 diaspora* 帳號的話，可以直接把 %{diaspora_id} 加到你的聯絡人喔。 + 祝順利！ diaspora* 電郵機器人 @@ -778,6 +780,9 @@ zh-TW: mentioned: limited_post: "你在一篇設限的貼文中被提到了。" subject: "%{name} 在 diaspora* 提到了你" + mentioned_in_comment: + limited_post: "你在一篇設限貼文的意見中被提到了。" + reply: "回或看這次對話 >" private_message: reply_to_or_view: "回或看這次對話 >" subject: "你有一則新的私人訊息。" @@ -1133,6 +1138,7 @@ zh-TW: last_exported_at: "(最後一次是在 %{timestamp} 更新)" liked: "有人稱讚你的貼文" mentioned: "有貼文提到了你" + mentioned_in_comment: "你在一則貼文的意見中被提到了" new_password: "新的密碼" private_message: "收到私人訊息" receive_email_notifications: "接收電子郵件通知的時機：" diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml index 32cc3a344..5b093deb9 100644 --- a/config/locales/javascript/javascript.da.yml +++ b/config/locales/javascript/javascript.da.yml @@ -241,6 +241,7 @@ da: reshares: post: "Videredel <%= name %>s indlæg?" successful: "Indlægget er blevet videredelt!" + show_all: "Vis alle" show_more: "Vis mere" stream: comment: "Kommenter" diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml index 15b45970c..1fc156df4 100644 --- a/config/locales/javascript/javascript.de.yml +++ b/config/locales/javascript/javascript.de.yml @@ -242,6 +242,7 @@ de: reshares: post: "<%= name %>s Beitrag weitersagen?" successful: "Der Beitrag wurde erfolgreich weitergesagt!" + show_all: "Alle anzeigen" show_more: "Mehr zeigen" stream: comment: "Kommentieren" @@ -260,11 +261,8 @@ de: hide_nsfw_posts: "#nsfw-Beiträge verstecken" like: "Gefällt mir" likes: - few: "<%= count %> Personen gefällt das" - many: "<%= count %> Personen gefällt das" one: " Einer Person gefällt das" other: "<%= count %> Personen gefällt das" - two: "<%= count %> Personen gefällt das" zero: "Niemandem gefällt das" limited: "Begrenzt" more_comments: diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml index f73704580..7d68220c5 100644 --- a/config/locales/javascript/javascript.de_formal.yml +++ b/config/locales/javascript/javascript.de_formal.yml @@ -129,7 +129,7 @@ de_formal: help: "Hilfe" home: "Startseite" log_out: "Abmelden" - mark_all_as_read: "Markiere alle als gelesen" + mark_all_as_read: "Alle als gelesen markieren" moderator: "Moderator" notifications: "Benachrichtigungen" profile: "Profil" @@ -241,6 +241,7 @@ de_formal: reshares: post: "<%= name %>s Beitrag weitersagen?" successful: "Der Beitrag wurde erfolgreich weitergesagt!" + show_all: "Alle anzeigen" show_more: "Mehr zeigen" stream: comment: "Kommentieren" diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 7c5071762..8f4ed6953 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -28,6 +28,7 @@ en: comma: "," edit: "Edit" no_results: "No results found" + show_all: "Show all" admins: dashboard: diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml index 6bb1a8b29..dbe3838f1 100644 --- a/config/locales/javascript/javascript.es.yml +++ b/config/locales/javascript/javascript.es.yml @@ -97,6 +97,8 @@ es: confirm_unload: "Por favor, confirma que quieres abandonar esta página. Los datos que no hayas introducido, no serán guardados." contacts: add_contact: "Añadir contacto" + aspect_chat_is_enabled: "Los contactos de este \"aspecto\" pueden chatear contigo." + aspect_chat_is_not_enabled: "Los contactos de este \"aspecto\" no pueden chatear contigo." aspect_list_is_not_visible: "Los contactos de este aspecto no pueden verse entre ellos." aspect_list_is_visible: "Los contactos de este aspecto pueden verse entre ellos." error_add: "No se pudo añadir a <%= name %> al aspecto :(" @@ -104,11 +106,15 @@ es: remove_contact: "Eliminar contacto" search_no_results: "No se encontraron contactos" conversation: + create: + no_recipient: "¡Eh, primero tienes que agregar un destinatario!" new: no_contacts: "Necesitas añadir algún contacto antes de empezar una conversación." create: "Crear" delete: "Eliminar" edit: "Editar" + errors: + connection: "No ha sido posible conectarse al servidor." failed_to_post_message: "¡Error al publicar el mensaje!" failed_to_remove: "¡Se produjo un error al eliminar la entrada!" getting_started: @@ -146,6 +152,9 @@ es: notifications: mark_read: "Marcar como leído" mark_unread: "Marcar como no leído" + new_notifications: + one: "Tienes <%= count %> notificación sin leer." + other: "Tienes <%= count %> notificaciones sin leer." people: edit_my_profile: "Editar mi perfil" helper: @@ -233,6 +242,7 @@ es: reshares: post: "¿Compartir la publicación de <%= name %>?" successful: "¡Publicación compartida con éxito!" + show_all: "Mostrar todo" show_more: "mostrar más" stream: comment: "Comentar" @@ -289,6 +299,7 @@ es: hour: "1 hora aproximadamente" hours: other: "%d horas aproximadamente" + inPast: "próximamente" minute: "1 minuto aproximadamente" minutes: other: "%d minutos" diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml index 4e0a6856f..063700e8d 100644 --- a/config/locales/javascript/javascript.fr.yml +++ b/config/locales/javascript/javascript.fr.yml @@ -243,13 +243,14 @@ fr: reshares: post: "Repartager le message de <%= name %> ?" successful: "Le message a été repartagé !" + show_all: "Afficher tout" show_more: "Voir plus" stream: comment: "Commenter" comments: - one: "<%= count %> commantaire" - other: "<%= count %> commantaires" - zero: "<%= count %> commantaire" + one: "<%= count %> commentaire" + other: "<%= count %> commentaires" + zero: "<%= count %> commentaire" disable_post_notifications: "Désactiver les notifications pour ce message" enable_post_notifications: "Activer les notifications pour ce message" follow: "Suivre" diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml index 4c3254345..7d7121ad5 100644 --- a/config/locales/javascript/javascript.hu.yml +++ b/config/locales/javascript/javascript.hu.yml @@ -159,6 +159,7 @@ hu: other: "Mutasd a többi <%= count %> hozzászólást" two: "Mutasd a többi <%= count %> hozzászólást" zero: "Mutasd a többi <%= count %> hozzászólást" + no_posts_yet: "Még nincs itt megjeleníthető bejegyzés." original_post_deleted: "Eredeti bejegyzés törölve a szerzője által." public: "Nyilvános" reshare: "Megosztás" diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml index bfa725878..77c302d88 100644 --- a/config/locales/javascript/javascript.ja.yml +++ b/config/locales/javascript/javascript.ja.yml @@ -233,6 +233,7 @@ ja: reshares: post: "<%= name %>さんの投稿をリシェアしますか?" successful: "投稿は正常にリシェアされました!" + show_all: "すべて表示" show_more: "さらに表示する" stream: comment: "コメント" diff --git a/config/locales/javascript/javascript.oc.yml b/config/locales/javascript/javascript.oc.yml index 922b8cffd..19730c5e3 100644 --- a/config/locales/javascript/javascript.oc.yml +++ b/config/locales/javascript/javascript.oc.yml @@ -54,7 +54,7 @@ oc: compare_versions: "La darrièra version de diaspora* es <%= latestVersion %>, vòstre pod vira jos la version <%= podVersion %>." error: "Impossible de determinar la darrièra version de diaspora*." outdated: "Vòstre pod es pas a jorn." - up_to_date: "Vòstre pod es a jorn !" + up_to_date: "Vòstre pod es a jorn !" and: "e" aspect_dropdown: add_to_aspect: "Apondre un contacte" @@ -86,7 +86,7 @@ oc: bookmarklet: post_something: "Publicar sus diaspora*" post_submit: "Messatge en cors de publicacion..." - post_success: "Publicat ! Tampadura de la fenèstra popup..." + post_success: "Publicat ! Tampadura de la fenèstra popup…" cancel: "Anullar" comma: "," comments: @@ -107,7 +107,7 @@ oc: search_no_results: "Cap de contact pas trobat" conversation: create: - no_recipient: "Ei, vos cal apondre un destinari d'en primièr !" + no_recipient: "Ei, vos cal apondre un destinari d'en primièr !" new: no_contacts: "Vos cal apondre de contactes abans de poder aviar una conversacion." create: "Crear" @@ -115,12 +115,12 @@ oc: edit: "Editar" errors: connection: "Impossible de se conectar al servidor." - failed_to_post_message: "Impossible de partejar lo messatge !" + failed_to_post_message: "Impossible de partejar lo messatge !" failed_to_remove: "L'entrada a pas pogut èsser suprimida" getting_started: alright_ill_wait: "Bon, vau esperar." hey: "Adiu, <%= name %>" - no_tags: "È, seguissètz pas cap de tag ! Contunar malgrat tot ?" + no_tags: "È, seguissètz pas cap d’etiquetas ! Contunhar malgrat tot ?" preparing_your_stream: "Preparacion de vòstre flux personalizat..." header: admin: "Administracion" @@ -170,7 +170,7 @@ oc: empty: "{file} es void, mercé de seleccionar d'autres fichièrs." error: "Un problèma s'es produit pendent lo mandadís del fichièr <%= file %>" invalid_ext: "{file} a una extension invalida, Solas {extensions} son permesas." - looking_good: "Impressionant, avètz un super estil !" + looking_good: "Impressionant, avètz un super estil !" size_error: "{file} es tròp gròs, la talha maximala es de {sizeLimit}." upload_photos: "Mandar de fotografias" poll: @@ -198,7 +198,7 @@ oc: location: "Localizacion" photos: "Fòtos" posts: "Publicacions" - you_have_no_tags: "Avètz pas d'etiquetas !" + you_have_no_tags: "Avètz pas d'etiquetas !" publisher: add_option: "Apondre una responsa" markdown_editor: @@ -229,8 +229,8 @@ oc: quote: "Inserir una citacion" write: "Modificar lo messatge" write: "Escriure" - mention_success: "Es ben estat mencionat : <%= names %>" - near_from: "Postat a : <%= location %>" + mention_success: "Es ben estat mencionat : <%= names %>" + near_from: "Postat a : <%= location %>" option: "Responsa" question: "Question" remove_post: "Suprimir aqueste messatge ?" @@ -243,7 +243,8 @@ oc: exists: "Lo senhalament existís ja" reshares: post: "Repartejar lo messatge de <%= name %> ?" - successful: "Lo messatge es estat repartejat !" + successful: "Lo messatge es estat repartejat !" + show_all: "Afichar tot" show_more: "N'afichar mai" stream: comment: "Comentar" diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml index e695f4a17..bdf4571ce 100644 --- a/config/locales/javascript/javascript.pl.yml +++ b/config/locales/javascript/javascript.pl.yml @@ -108,7 +108,7 @@ pl: getting_started: alright_ill_wait: "Dobrze, poczekam." hey: "Hej, <%= name %>!" - no_tags: "Hej, nie obserwujesz żadnych znaczników! Kontynuować mimo to?" + no_tags: "Hej, nie obserwujesz żadnych tagów! Kontynuować mimo to?" preparing_your_stream: "Przygotowanie spersonalizowanego strumienia..." header: admin: "Administrator" @@ -225,6 +225,7 @@ pl: reshares: post: "Przesłać dalej wpis użytkownika <%= name %>?" successful: "Wpis został pomyślnie przesłany dalej!" + show_all: "Pokaż wszystkie" show_more: "wyświetl więcej" stream: comment: "Skomentuj" @@ -232,9 +233,9 @@ pl: enable_post_notifications: "Włącz powiadomienia do tego wpisu" follow: "Obserwuj" followed_tag: - add_a_tag: "Dodaj znacznik" + add_a_tag: "Dodaj tag" follow: "Obserwuj" - title: "#Obserwowane znaczniki" + title: "#Obserwowane tagi" hide: "Ukryj" hide_nsfw_posts: "Ukryj wpisy #nsfw" like: "Lubię to!" @@ -279,16 +280,25 @@ pl: timeago: day: "dzień" days: - other: "%d dni" + few: "%d dni temu" + many: "%d dni temu" + one: "1 dzień temu" + other: "%d dni temu" hour: "około godziny" hours: - other: "około %d godzin" + few: "około %d godziny" + many: "około %d godzin" + one: "około godzinę" + other: "około %d godziny" inPast: "w każdej chwili" minute: "około minuty" minutes: other: "%d minut" month: "około miesiąca" months: + few: "%d miesiące" + many: "%d miesięcy" + one: "miesiąc" other: "%d miesięcy" prefixAgo: "" prefixFromNow: "" diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml index fac60e12a..74b0d55f7 100644 --- a/config/locales/javascript/javascript.pt-BR.yml +++ b/config/locales/javascript/javascript.pt-BR.yml @@ -243,6 +243,7 @@ pt-BR: reshares: post: "Recompartilhar a publicação de <%= name %>?" successful: "A publicação foi recompartilhada com sucesso!" + show_all: "Mostrar tudo" show_more: "Mostrar mais" stream: comment: "Comentar" diff --git a/config/locales/javascript/javascript.sc.yml b/config/locales/javascript/javascript.sc.yml index 1bfdf63d6..c174b2888 100644 --- a/config/locales/javascript/javascript.sc.yml +++ b/config/locales/javascript/javascript.sc.yml @@ -6,12 +6,15 @@ sc: javascripts: + aspects: + make_aspect_list_visible: "Permìtere a sos cuntatos in custa cara de si bìdere unu cun s'àteru?" header: moderator: "Moderatore" photo_uploader: upload_photos: "Càrriga fotografias" publisher: mention_success: "Etichetados curretamente: <%= names %>" + show_all: "Ammustra totu" timeago: prefixAgo: "" prefixFromNow: "" diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml index 60385bbcc..f1deb87d2 100644 --- a/config/locales/javascript/javascript.uk.yml +++ b/config/locales/javascript/javascript.uk.yml @@ -130,7 +130,7 @@ uk: getting_started: alright_ill_wait: "Добре, я почекаю." hey: "Привіт, <%= name %>!" - no_tags: "Ви не стежите ні за однією міткою! Все одно продовжити?" + no_tags: "Ви не стежите за жодною міткою! Все одно продовжити?" preparing_your_stream: "Підготовка вашого особистого потоку..." header: admin: "Керування" @@ -259,6 +259,7 @@ uk: reshares: post: "Поширити запис <%= name %>?" successful: "Ви успішно поділилися записом!" + show_all: "Показати все" show_more: "показати більше" stream: comment: "Коментувати" diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml index 29053b465..80c037f24 100644 --- a/config/locales/javascript/javascript.zh-TW.yml +++ b/config/locales/javascript/javascript.zh-TW.yml @@ -234,6 +234,7 @@ zh-TW: reshares: post: "要轉貼 <%= name %> 的貼文嗎？" successful: "貼文轉貼成功！" + show_all: "看全部" show_more: "顯示更多" stream: comment: "留言" diff --git a/config/logging.rb b/config/logging.rb index 57cf39b0a..230ea8117 100644 --- a/config/logging.rb +++ b/config/logging.rb @@ -85,6 +85,7 @@ Logging::Rails.configure do |config| Logging.logger.root.level = config.log_level # log-levels from the diaspora.yml for SQL and federation debug-logging + Logging.logger[ActionView::Base].level = Rails.env.development? ? :debug : :warn Logging.logger[ActiveRecord::Base].level = AppConfig.environment.logging.debug.sql? ? :debug : :info Logging.logger[DiasporaFederation::Salmon::MagicEnvelope].level = AppConfig.environment.logging.debug.federation? ? :debug : :info @@ -103,3 +104,10 @@ Logging::Rails.configure do |config| end end end + +# Include LoggerSilence from ActiveSupport. This is needed to silent assets +# requests with `config.assets.quiet`, because the default silence method of +# the logging gem is no-op. See: https://github.com/TwP/logging/issues/11 +Logging::Logger.send :alias_method, :local_level, :level +Logging::Logger.send :alias_method, :local_level=, :level= +Logging::Logger.send :include, LoggerSilence diff --git a/config/routes.rb b/config/routes.rb index b75883051..82d9afc91 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,8 @@ require "sidekiq/web" require "sidekiq/cron/web" Sidekiq::Web.set :sessions, false # disable rack session cookie -Diaspora::Application.routes.draw do +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :report, except: %i(edit new show) @@ -28,7 +29,7 @@ Diaspora::Application.routes.draw do resources :posts, only: %i(show destroy) do member do - get :interactions + get :mentionable end resource :participation, only: %i(create destroy) @@ -229,6 +230,5 @@ Diaspora::Application.routes.draw do end end - get ".well-known/webfinger", to: "api/openid_connect/discovery#webfinger" get ".well-known/openid-configuration", to: "api/openid_connect/discovery#configuration" end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..0598e88c3 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each {|path| Spring.watch(path) } diff --git a/db/migrate/0000_create_schema.rb b/db/migrate/0000_create_schema.rb index 97fcc3da6..a6393fd40 100644 --- a/db/migrate/0000_create_schema.rb +++ b/db/migrate/0000_create_schema.rb @@ -1,488 +1,492 @@ -class CreateSchema < ActiveRecord::Migration - create_table "account_deletions", :force => true do |t| - t.string "diaspora_handle" - t.integer "person_id" +class CreateSchema < ActiveRecord::Migration[4.2] + # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing + def up + create_table :account_deletions do |t| + t.string :diaspora_handle + t.integer :person_id + end + + create_table :aspect_memberships do |t| + t.integer :aspect_id, null: false + t.integer :contact_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :aspect_memberships, %i[aspect_id contact_id], name: :index_aspect_memberships_on_aspect_id_and_contact_id, unique: true + add_index :aspect_memberships, [:aspect_id], name: :index_aspect_memberships_on_aspect_id + add_index :aspect_memberships, [:contact_id], name: :index_aspect_memberships_on_contact_id + + create_table :aspect_visibilities do |t| + t.integer :shareable_id, null: false + t.integer :aspect_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.string :shareable_type, default: "Post", null: false + end + + add_index :aspect_visibilities, [:aspect_id], name: :index_aspect_visibilities_on_aspect_id + add_index :aspect_visibilities, %i[shareable_id shareable_type aspect_id], name: :shareable_and_aspect_id, length: {shareable_type: 189}, using: :btree + add_index :aspect_visibilities, %i[shareable_id shareable_type], name: :index_aspect_visibilities_on_shareable_id_and_shareable_type, length: {shareable_type: 190}, using: :btree + + create_table :aspects do |t| + t.string :name, null: false + t.integer :user_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.boolean :contacts_visible, default: true, null: false + t.integer :order_id + end + + add_index :aspects, %i[user_id contacts_visible], name: :index_aspects_on_user_id_and_contacts_visible + add_index :aspects, [:user_id], name: :index_aspects_on_user_id + + create_table :blocks do |t| + t.integer :user_id + t.integer :person_id + end + + create_table :comments do |t| + t.text :text, null: false + t.integer :commentable_id, null: false + t.integer :author_id, null: false + t.string :guid, null: false + t.text :author_signature + t.text :parent_author_signature + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.integer :likes_count, default: 0, null: false + t.string :commentable_type, limit: 60, default: "Post", null: false + end + + add_index :comments, [:author_id], name: :index_comments_on_person_id + add_index :comments, %i[commentable_id commentable_type], name: :index_comments_on_commentable_id_and_commentable_type + add_index :comments, [:guid], name: :index_comments_on_guid, length: {guid: 191}, using: :btree, unique: true + + create_table :contacts do |t| + t.integer :user_id, null: false + t.integer :person_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.boolean :sharing, default: false, null: false + t.boolean :receiving, default: false, null: false + end + + add_index :contacts, [:person_id], name: :index_contacts_on_person_id + add_index :contacts, %i[user_id person_id], name: :index_contacts_on_user_id_and_person_id, unique: true + + create_table :conversation_visibilities do |t| + t.integer :conversation_id, null: false + t.integer :person_id, null: false + t.integer :unread, default: 0, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :conversation_visibilities, %i[conversation_id person_id], name: :index_conversation_visibilities_usefully, unique: true + add_index :conversation_visibilities, [:conversation_id], name: :index_conversation_visibilities_on_conversation_id + add_index :conversation_visibilities, [:person_id], name: :index_conversation_visibilities_on_person_id + + create_table :conversations do |t| + t.string :subject + t.string :guid, null: false + t.integer :author_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :conversations, [:author_id], name: :conversations_author_id_fk + + create_table :invitation_codes do |t| + t.string :token + t.integer :user_id + t.integer :count + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + create_table :invitations do |t| + t.text :message + t.integer :sender_id + t.integer :recipient_id + t.integer :aspect_id + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.string :service + t.string :identifier + t.boolean :admin, default: false + t.string :language, default: "en" + end + + add_index :invitations, [:aspect_id], name: :index_invitations_on_aspect_id + add_index :invitations, [:recipient_id], name: :index_invitations_on_recipient_id + add_index :invitations, [:sender_id], name: :index_invitations_on_sender_id + + create_table :likes do |t| + t.boolean :positive, default: true + t.integer :target_id + t.integer :author_id + t.string :guid + t.text :author_signature + t.text :parent_author_signature + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.string :target_type, limit: 60, null: false + end + + add_index :likes, [:author_id], name: :likes_author_id_fk + add_index :likes, [:guid], name: :index_likes_on_guid, length: {guid: 191}, using: :btree, unique: true + add_index :likes, %i[target_id author_id target_type], name: :index_likes_on_target_id_and_author_id_and_target_type, unique: true + add_index :likes, [:target_id], name: :index_likes_on_post_id + + create_table :locations do |t| + t.string :address + t.string :lat + t.string :lng + t.integer :status_message_id + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + create_table :mentions do |t| + t.integer :post_id, null: false + t.integer :person_id, null: false + end + + add_index :mentions, %i[person_id post_id], name: :index_mentions_on_person_id_and_post_id, unique: true + add_index :mentions, [:person_id], name: :index_mentions_on_person_id + add_index :mentions, [:post_id], name: :index_mentions_on_post_id + + create_table :messages do |t| + t.integer :conversation_id, null: false + t.integer :author_id, null: false + t.string :guid, null: false + t.text :text, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.text :author_signature + t.text :parent_author_signature + end + + add_index :messages, [:author_id], name: :index_messages_on_author_id + add_index :messages, [:conversation_id], name: :messages_conversation_id_fk + + create_table :notification_actors do |t| + t.integer :notification_id + t.integer :person_id + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :notification_actors, %i[notification_id person_id], name: :index_notification_actors_on_notification_id_and_person_id, unique: true + add_index :notification_actors, [:notification_id], name: :index_notification_actors_on_notification_id + add_index :notification_actors, [:person_id], name: :index_notification_actors_on_person_id + + create_table :notifications do |t| + t.string :target_type + t.integer :target_id + t.integer :recipient_id, null: false + t.boolean :unread, default: true, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.string :type + end + + add_index :notifications, [:recipient_id], name: :index_notifications_on_recipient_id + add_index :notifications, [:target_id], name: :index_notifications_on_target_id + add_index :notifications, %i[target_type target_id], name: :index_notifications_on_target_type_and_target_id, length: {target_type: 190}, using: :btree + + create_table :o_embed_caches do |t| + t.string :url, limit: 1024, null: false + t.text :data, null: false + end + + add_index :o_embed_caches, [:url], name: :index_o_embed_caches_on_url, length: {url: 191}, using: :btree + + create_table :participations do |t| + t.string :guid + t.integer :target_id + t.string :target_type, limit: 60, null: false + t.integer :author_id + t.text :author_signature + t.text :parent_author_signature + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :participations, [:guid], name: :index_participations_on_guid, length: {guid: 191}, using: :btree + add_index :participations, %i[target_id target_type author_id], name: :index_participations_on_target_id_and_target_type_and_author_id + + create_table :people do |t| + t.string :guid, null: false + t.text :url, null: false + t.string :diaspora_handle, null: false + t.text :serialized_public_key, null: false + t.integer :owner_id + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.boolean :closed_account, default: false + t.integer :fetch_status, default: 0 + end + + add_index :people, [:diaspora_handle], name: :index_people_on_diaspora_handle, unique: true, length: {diaspora_handle: 191} + add_index :people, [:guid], name: :index_people_on_guid, length: {guid: 191}, using: :btree, unique: true + add_index :people, [:owner_id], name: :index_people_on_owner_id, unique: true + + create_table :photos do |t| + t.integer :tmp_old_id + t.integer :author_id, null: false + t.boolean :public, default: false, null: false + t.string :diaspora_handle + t.string :guid, null: false + t.boolean :pending, default: false, null: false + t.text :text + t.text :remote_photo_path + t.string :remote_photo_name + t.string :random_string + t.string :processed_image + t.datetime :created_at + t.datetime :updated_at + t.string :unprocessed_image + t.string :status_message_guid + t.integer :comments_count + t.integer :height + t.integer :width + end + + add_index :photos, [:status_message_guid], name: :index_photos_on_status_message_guid, length: {status_message_guid: 191}, using: :btree + + create_table :pods do |t| + t.string :host + t.boolean :ssl + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + create_table :posts do |t| + t.integer :author_id, null: false + t.boolean :public, default: false, null: false + t.string :diaspora_handle + t.string :guid, null: false + t.boolean :pending, default: false, null: false + t.string :type, limit: 40, null: false + t.text :text + t.text :remote_photo_path + t.string :remote_photo_name + t.string :random_string + t.string :processed_image + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.string :unprocessed_image + t.string :object_url + t.string :image_url + t.integer :image_height + t.integer :image_width + t.string :provider_display_name + t.string :actor_url + t.string :objectId + t.string :root_guid, limit: 30 + t.string :status_message_guid + t.integer :likes_count, default: 0 + t.integer :comments_count, default: 0 + t.integer :o_embed_cache_id + t.integer :reshares_count, default: 0 + t.datetime :interacted_at + t.string :frame_name + t.boolean :favorite, default: false + end + + add_index :posts, %i[author_id root_guid], name: :index_posts_on_author_id_and_root_guid, length: {root_guid: 30}, using: :btree, unique: true + add_index :posts, [:author_id], name: :index_posts_on_person_id + add_index :posts, [:guid], name: :index_posts_on_guid, length: {guid: 191}, using: :btree, unique: true + add_index :posts, %i[id type created_at], name: :index_posts_on_id_and_type_and_created_at + add_index :posts, [:root_guid], name: :index_posts_on_root_guid, length: {root_guid: 30} + add_index :posts, %i[status_message_guid pending], name: :index_posts_on_status_message_guid_and_pending, length: {status_message_guid: 190}, using: :btree + add_index :posts, [:status_message_guid], name: :index_posts_on_status_message_guid, length: {status_message_guid: 191}, using: :btree + add_index :posts, %i[type pending id], name: :index_posts_on_type_and_pending_and_id + + create_table :profiles do |t| + t.string :diaspora_handle + t.string :first_name, limit: 127 + t.string :last_name, limit: 127 + t.string :image_url + t.string :image_url_small + t.string :image_url_medium + t.date :birthday + t.string :gender + t.text :bio + t.boolean :searchable, default: true, null: false + t.integer :person_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.string :location + t.string :full_name, limit: 70 + t.boolean :nsfw, default: false + end + + add_index :profiles, %i[full_name searchable], name: :index_profiles_on_full_name_and_searchable + add_index :profiles, [:full_name], name: :index_profiles_on_full_name + add_index :profiles, [:person_id], name: :index_profiles_on_person_id + + create_table :rails_admin_histories do |t| + t.text :message + t.string :username + t.integer :item + t.string :table + t.integer :month, limit: 2 + t.integer :year, limit: 8 + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :rails_admin_histories, %i[item table month year], name: :index_rails_admin_histories, length: {table: 188} + + create_table :roles do |t| + t.integer :person_id + t.string :name + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + create_table :services do |t| + t.string :type, limit: 127, null: false + t.integer :user_id, null: false + t.string :uid, limit: 127 + t.string :access_token + t.string :access_secret + t.string :nickname + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :services, %i[type uid], name: :index_services_on_type_and_uid, length: {type: 64, uid: 127}, using: :btree + add_index :services, [:user_id], name: :index_services_on_user_id + + create_table :share_visibilities do |t| + t.integer :shareable_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.boolean :hidden, default: false, null: false + t.integer :contact_id, null: false + t.string :shareable_type, limit: 60, default: "Post", null: false + end + + add_index :share_visibilities, [:contact_id], name: :index_post_visibilities_on_contact_id + add_index :share_visibilities, %i[shareable_id shareable_type contact_id], name: :shareable_and_contact_id + add_index :share_visibilities, %i[shareable_id shareable_type hidden contact_id], name: :shareable_and_hidden_and_contact_id + add_index :share_visibilities, [:shareable_id], name: :index_post_visibilities_on_post_id + + create_table :tag_followings do |t| + t.integer :tag_id, null: false + t.integer :user_id, null: false + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + add_index :tag_followings, %i[tag_id user_id], name: :index_tag_followings_on_tag_id_and_user_id, unique: true + add_index :tag_followings, [:tag_id], name: :index_tag_followings_on_tag_id + add_index :tag_followings, [:user_id], name: :index_tag_followings_on_user_id + + create_table :taggings do |t| + t.integer :tag_id + t.integer :taggable_id + t.string :taggable_type, limit: 127 + t.integer :tagger_id + t.string :tagger_type, limit: 127 + t.string :context, limit: 127 + t.datetime :created_at + end + + add_index :taggings, [:created_at], name: :index_taggings_on_created_at + add_index :taggings, [:tag_id], name: :index_taggings_on_tag_id + add_index :taggings, %i[taggable_id taggable_type context], name: :index_taggings_on_taggable_id_and_taggable_type_and_context, length: {taggable_type: 95, context: 95}, using: :btree + add_index :taggings, %i[taggable_id taggable_type tag_id], name: :index_taggings_uniquely, unique: true + + create_table :tags do |t| + t.string :name + end + + add_index :tags, [:name], name: :index_tags_on_name, unique: true, length: {name: 191} + + create_table :user_preferences do |t| + t.string :email_type + t.integer :user_id + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + + create_table :users do |t| + t.string :username + t.text :serialized_private_key + t.boolean :getting_started, default: true, null: false + t.boolean :disable_mail, default: false, null: false + t.string :language + t.string :email, default: "", null: false + t.string :encrypted_password, default: "", null: false + t.string :invitation_token, limit: 60 + t.datetime :invitation_sent_at + t.string :reset_password_token + t.datetime :remember_created_at + t.integer :sign_in_count, default: 0 + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + t.string :invitation_service, limit: 127 + t.string :invitation_identifier, limit: 127 + t.integer :invitation_limit + t.integer :invited_by_id + t.string :invited_by_type + t.string :authentication_token, limit: 30 + t.string :unconfirmed_email + t.string :confirm_email_token, limit: 30 + t.datetime :locked_at + t.boolean :show_community_spotlight_in_stream, default: true, null: false + t.boolean :auto_follow_back, default: false + t.integer :auto_follow_back_aspect_id + t.text :hidden_shareables + t.datetime :reset_password_sent_at + end + + add_index :users, [:authentication_token], name: :index_users_on_authentication_token, unique: true + add_index :users, [:email], name: :index_users_on_email, length: {email: 191} + add_index :users, %i[invitation_service invitation_identifier], name: :index_users_on_invitation_service_and_invitation_identifier, length: {invitation_service: 64, invitation_identifier: 127}, using: :btree, unique: true + add_index :users, [:invitation_token], name: :index_users_on_invitation_token + add_index :users, [:username], name: :index_users_on_username, length: {username: 191}, using: :btree, unique: true + + add_foreign_key :aspect_memberships, :aspects, name: :aspect_memberships_aspect_id_fk, on_delete: :cascade + add_foreign_key :aspect_memberships, :contacts, name: :aspect_memberships_contact_id_fk, on_delete: :cascade + + add_foreign_key :aspect_visibilities, :aspects, name: :aspect_visibilities_aspect_id_fk, on_delete: :cascade + + add_foreign_key :comments, :people, name: :comments_author_id_fk, column: :author_id, on_delete: :cascade + + add_foreign_key :contacts, :people, name: :contacts_person_id_fk, on_delete: :cascade + + add_foreign_key :conversation_visibilities, :conversations, name: :conversation_visibilities_conversation_id_fk, on_delete: :cascade + add_foreign_key :conversation_visibilities, :people, name: :conversation_visibilities_person_id_fk, on_delete: :cascade + + add_foreign_key :conversations, :people, name: :conversations_author_id_fk, column: :author_id, on_delete: :cascade + + add_foreign_key :invitations, :users, name: :invitations_recipient_id_fk, column: :recipient_id, on_delete: :cascade + add_foreign_key :invitations, :users, name: :invitations_sender_id_fk, column: :sender_id, on_delete: :cascade + + add_foreign_key :likes, :people, name: :likes_author_id_fk, column: :author_id, on_delete: :cascade + + add_foreign_key :messages, :conversations, name: :messages_conversation_id_fk, on_delete: :cascade + add_foreign_key :messages, :people, name: :messages_author_id_fk, column: :author_id, on_delete: :cascade + + add_foreign_key :notification_actors, :notifications, name: :notification_actors_notification_id_fk, on_delete: :cascade + + add_foreign_key :posts, :people, name: :posts_author_id_fk, column: :author_id, on_delete: :cascade + + add_foreign_key :profiles, :people, name: :profiles_person_id_fk, on_delete: :cascade + + add_foreign_key :services, :users, name: :services_user_id_fk, on_delete: :cascade + + add_foreign_key :share_visibilities, :contacts, name: :post_visibilities_contact_id_fk, on_delete: :cascade end - - create_table "aspect_memberships", :force => true do |t| - t.integer "aspect_id", :null => false - t.integer "contact_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "aspect_memberships", ["aspect_id", "contact_id"], :name => "index_aspect_memberships_on_aspect_id_and_contact_id", :unique => true - add_index "aspect_memberships", ["aspect_id"], :name => "index_aspect_memberships_on_aspect_id" - add_index "aspect_memberships", ["contact_id"], :name => "index_aspect_memberships_on_contact_id" - - create_table "aspect_visibilities", :force => true do |t| - t.integer "shareable_id", :null => false - t.integer "aspect_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "shareable_type", :default => "Post", :null => false - end - - add_index "aspect_visibilities", ["aspect_id"], :name => "index_aspect_visibilities_on_aspect_id" - add_index 'aspect_visibilities', ["shareable_id", "shareable_type", "aspect_id"], :name => 'shareable_and_aspect_id', length: {"shareable_type"=>189}, :using => :btree - add_index 'aspect_visibilities', ["shareable_id", "shareable_type"], :name => 'index_aspect_visibilities_on_shareable_id_and_shareable_type', length: {"shareable_type"=>190}, :using => :btree - - create_table "aspects", :force => true do |t| - t.string "name", :null => false - t.integer "user_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.boolean "contacts_visible", :default => true, :null => false - t.integer "order_id" - end - - add_index "aspects", ["user_id", "contacts_visible"], :name => "index_aspects_on_user_id_and_contacts_visible" - add_index "aspects", ["user_id"], :name => "index_aspects_on_user_id" - - create_table "blocks", :force => true do |t| - t.integer "user_id" - t.integer "person_id" - end - - create_table "comments", :force => true do |t| - t.text "text", :null => false - t.integer "commentable_id", :null => false - t.integer "author_id", :null => false - t.string "guid", :null => false - t.text "author_signature" - t.text "parent_author_signature" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "likes_count", :default => 0, :null => false - t.string "commentable_type", :limit => 60, :default => "Post", :null => false - end - - add_index "comments", ["author_id"], :name => "index_comments_on_person_id" - add_index "comments", ["commentable_id", "commentable_type"], :name => "index_comments_on_commentable_id_and_commentable_type" - add_index 'comments', ["guid"], :name => 'index_comments_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - - create_table "contacts", :force => true do |t| - t.integer "user_id", :null => false - t.integer "person_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.boolean "sharing", :default => false, :null => false - t.boolean "receiving", :default => false, :null => false - end - - add_index "contacts", ["person_id"], :name => "index_contacts_on_person_id" - add_index "contacts", ["user_id", "person_id"], :name => "index_contacts_on_user_id_and_person_id", :unique => true - - create_table "conversation_visibilities", :force => true do |t| - t.integer "conversation_id", :null => false - t.integer "person_id", :null => false - t.integer "unread", :default => 0, :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "conversation_visibilities", ["conversation_id", "person_id"], :name => "index_conversation_visibilities_usefully", :unique => true - add_index "conversation_visibilities", ["conversation_id"], :name => "index_conversation_visibilities_on_conversation_id" - add_index "conversation_visibilities", ["person_id"], :name => "index_conversation_visibilities_on_person_id" - - create_table "conversations", :force => true do |t| - t.string "subject" - t.string "guid", :null => false - t.integer "author_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "conversations", ["author_id"], :name => "conversations_author_id_fk" - - create_table "invitation_codes", :force => true do |t| - t.string "token" - t.integer "user_id" - t.integer "count" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "invitations", :force => true do |t| - t.text "message" - t.integer "sender_id" - t.integer "recipient_id" - t.integer "aspect_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "service" - t.string "identifier" - t.boolean "admin", :default => false - t.string "language", :default => "en" - end - - add_index "invitations", ["aspect_id"], :name => "index_invitations_on_aspect_id" - add_index "invitations", ["recipient_id"], :name => "index_invitations_on_recipient_id" - add_index "invitations", ["sender_id"], :name => "index_invitations_on_sender_id" - - create_table "likes", :force => true do |t| - t.boolean "positive", :default => true - t.integer "target_id" - t.integer "author_id" - t.string "guid" - t.text "author_signature" - t.text "parent_author_signature" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "target_type", :limit => 60, :null => false - end - - add_index "likes", ["author_id"], :name => "likes_author_id_fk" - add_index 'likes', ["guid"], :name => 'index_likes_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - add_index "likes", ["target_id", "author_id", "target_type"], :name => "index_likes_on_target_id_and_author_id_and_target_type", :unique => true - add_index "likes", ["target_id"], :name => "index_likes_on_post_id" - - create_table "locations", :force => true do |t| - t.string "address" - t.string "lat" - t.string "lng" - t.integer "status_message_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "mentions", :force => true do |t| - t.integer "post_id", :null => false - t.integer "person_id", :null => false - end - - add_index "mentions", ["person_id", "post_id"], :name => "index_mentions_on_person_id_and_post_id", :unique => true - add_index "mentions", ["person_id"], :name => "index_mentions_on_person_id" - add_index "mentions", ["post_id"], :name => "index_mentions_on_post_id" - - create_table "messages", :force => true do |t| - t.integer "conversation_id", :null => false - t.integer "author_id", :null => false - t.string "guid", :null => false - t.text "text", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "author_signature" - t.text "parent_author_signature" - end - - add_index "messages", ["author_id"], :name => "index_messages_on_author_id" - add_index "messages", ["conversation_id"], :name => "messages_conversation_id_fk" - - create_table "notification_actors", :force => true do |t| - t.integer "notification_id" - t.integer "person_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "notification_actors", ["notification_id", "person_id"], :name => "index_notification_actors_on_notification_id_and_person_id", :unique => true - add_index "notification_actors", ["notification_id"], :name => "index_notification_actors_on_notification_id" - add_index "notification_actors", ["person_id"], :name => "index_notification_actors_on_person_id" - - create_table "notifications", :force => true do |t| - t.string "target_type" - t.integer "target_id" - t.integer "recipient_id", :null => false - t.boolean "unread", :default => true, :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "type" - end - - add_index "notifications", ["recipient_id"], :name => "index_notifications_on_recipient_id" - add_index "notifications", ["target_id"], :name => "index_notifications_on_target_id" - add_index 'notifications', ["target_type", "target_id"], name: 'index_notifications_on_target_type_and_target_id', length: {"target_type"=>190}, using: :btree - - create_table "o_embed_caches", :force => true do |t| - t.string "url", :limit => 1024, :null => false - t.text "data", :null => false - end - - add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url", :length => {"url"=> 191}, using: :btree - - create_table "participations", :force => true do |t| - t.string "guid" - t.integer "target_id" - t.string "target_type", :limit => 60, :null => false - t.integer "author_id" - t.text "author_signature" - t.text "parent_author_signature" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index 'participations', ["guid"], :name => 'index_participations_on_guid', length: {"guid"=>191}, :using => :btree - add_index "participations", ["target_id", "target_type", "author_id"], :name => "index_participations_on_target_id_and_target_type_and_author_id" - - create_table "people", :force => true do |t| - t.string "guid", :null => false - t.text "url", :null => false - t.string "diaspora_handle", :null => false - t.text "serialized_public_key", :null => false - t.integer "owner_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.boolean "closed_account", :default => false - t.integer "fetch_status", :default => 0 - end - - add_index "people", ["diaspora_handle"], :name => "index_people_on_diaspora_handle", :unique => true, :length => {"diaspora_handle" => 191} - add_index 'people', ["guid"], :name => 'index_people_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - add_index "people", ["owner_id"], :name => "index_people_on_owner_id", :unique => true - - create_table "photos", :force => true do |t| - t.integer "tmp_old_id" - t.integer "author_id", :null => false - t.boolean "public", :default => false, :null => false - t.string "diaspora_handle" - t.string "guid", :null => false - t.boolean "pending", :default => false, :null => false - t.text "text" - t.text "remote_photo_path" - t.string "remote_photo_name" - t.string "random_string" - t.string "processed_image" - t.datetime "created_at" - t.datetime "updated_at" - t.string "unprocessed_image" - t.string "status_message_guid" - t.integer "comments_count" - t.integer "height" - t.integer "width" - end - - add_index 'photos', ["status_message_guid"], :name => 'index_photos_on_status_message_guid', length: {"status_message_guid"=>191}, :using => :btree - - create_table "pods", :force => true do |t| - t.string "host" - t.boolean "ssl" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "posts", :force => true do |t| - t.integer "author_id", :null => false - t.boolean "public", :default => false, :null => false - t.string "diaspora_handle" - t.string "guid", :null => false - t.boolean "pending", :default => false, :null => false - t.string "type", :limit => 40, :null => false - t.text "text" - t.text "remote_photo_path" - t.string "remote_photo_name" - t.string "random_string" - t.string "processed_image" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "unprocessed_image" - t.string "object_url" - t.string "image_url" - t.integer "image_height" - t.integer "image_width" - t.string "provider_display_name" - t.string "actor_url" - t.string "objectId" - t.string "root_guid", :limit => 30 - t.string "status_message_guid" - t.integer "likes_count", :default => 0 - t.integer "comments_count", :default => 0 - t.integer "o_embed_cache_id" - t.integer "reshares_count", :default => 0 - t.datetime "interacted_at" - t.string "frame_name" - t.boolean "favorite", :default => false - end - - add_index 'posts', ["author_id", "root_guid"], :name => 'index_posts_on_author_id_and_root_guid', length: {"root_guid"=>30}, :using => :btree, :unique => true - add_index "posts", ["author_id"], :name => "index_posts_on_person_id" - add_index 'posts', ["guid"], :name => 'index_posts_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - add_index "posts", ["id", "type", "created_at"], :name => "index_posts_on_id_and_type_and_created_at" - add_index 'posts', ["root_guid"], :name => 'index_posts_on_root_guid', length: {"root_guid"=>30} - add_index 'posts', ["status_message_guid", "pending"], :name => 'index_posts_on_status_message_guid_and_pending', length: {"status_message_guid"=>190}, :using => :btree - add_index 'posts', ["status_message_guid"], :name => 'index_posts_on_status_message_guid', length: {"status_message_guid"=>191}, :using => :btree - add_index "posts", ["type", "pending", "id"], :name => "index_posts_on_type_and_pending_and_id" - - create_table "profiles", :force => true do |t| - t.string "diaspora_handle" - t.string "first_name", :limit => 127 - t.string "last_name", :limit => 127 - t.string "image_url" - t.string "image_url_small" - t.string "image_url_medium" - t.date "birthday" - t.string "gender" - t.text "bio" - t.boolean "searchable", :default => true, :null => false - t.integer "person_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "location" - t.string "full_name", :limit => 70 - t.boolean "nsfw", :default => false - end - - add_index "profiles", ["full_name", "searchable"], :name => "index_profiles_on_full_name_and_searchable" - add_index "profiles", ["full_name"], :name => "index_profiles_on_full_name" - add_index "profiles", ["person_id"], :name => "index_profiles_on_person_id" - - create_table "rails_admin_histories", :force => true do |t| - t.text "message" - t.string "username" - t.integer "item" - t.string "table" - t.integer "month", :limit => 2 - t.integer "year", :limit => 8 - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "rails_admin_histories", ["item", "table", "month", "year"], :name => "index_rails_admin_histories", :length => {"table" => 188} - - create_table "roles", :force => true do |t| - t.integer "person_id" - t.string "name" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "services", :force => true do |t| - t.string "type", :limit => 127, :null => false - t.integer "user_id", :null => false - t.string "uid", :limit => 127 - t.string "access_token" - t.string "access_secret" - t.string "nickname" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index 'services', ["type", "uid"], :name => 'index_services_on_type_and_uid', length: {"type"=>64, "uid"=>127}, :using => :btree - add_index "services", ["user_id"], :name => "index_services_on_user_id" - - create_table "share_visibilities", :force => true do |t| - t.integer "shareable_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.boolean "hidden", :default => false, :null => false - t.integer "contact_id", :null => false - t.string "shareable_type", :limit => 60, :default => "Post", :null => false - end - - add_index "share_visibilities", ["contact_id"], :name => "index_post_visibilities_on_contact_id" - add_index "share_visibilities", ["shareable_id", "shareable_type", "contact_id"], :name => "shareable_and_contact_id" - add_index "share_visibilities", ["shareable_id", "shareable_type", "hidden", "contact_id"], :name => "shareable_and_hidden_and_contact_id" - add_index "share_visibilities", ["shareable_id"], :name => "index_post_visibilities_on_post_id" - - create_table "tag_followings", :force => true do |t| - t.integer "tag_id", :null => false - t.integer "user_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "tag_followings", ["tag_id", "user_id"], :name => "index_tag_followings_on_tag_id_and_user_id", :unique => true - add_index "tag_followings", ["tag_id"], :name => "index_tag_followings_on_tag_id" - add_index "tag_followings", ["user_id"], :name => "index_tag_followings_on_user_id" - - create_table "taggings", :force => true do |t| - t.integer "tag_id" - t.integer "taggable_id" - t.string "taggable_type", :limit => 127 - t.integer "tagger_id" - t.string "tagger_type", :limit => 127 - t.string "context", :limit => 127 - t.datetime "created_at" - end - - add_index "taggings", ["created_at"], :name => "index_taggings_on_created_at" - add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" - add_index 'taggings', ["taggable_id", "taggable_type", "context"], :name => 'index_taggings_on_taggable_id_and_taggable_type_and_context', length: {"taggable_type"=>95, "context"=>95}, :using => :btree - add_index "taggings", ["taggable_id", "taggable_type", "tag_id"], :name => "index_taggings_uniquely", :unique => true - - create_table "tags", :force => true do |t| - t.string "name" - end - - add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true, :length => {"name" => 191} - - create_table "user_preferences", :force => true do |t| - t.string "email_type" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "users", :force => true do |t| - t.string "username" - t.text "serialized_private_key" - t.boolean "getting_started", :default => true, :null => false - t.boolean "disable_mail", :default => false, :null => false - t.string "language" - t.string "email", :default => "", :null => false - t.string "encrypted_password", :default => "", :null => false - t.string "invitation_token", :limit => 60 - t.datetime "invitation_sent_at" - t.string "reset_password_token" - t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "invitation_service", :limit => 127 - t.string "invitation_identifier", :limit => 127 - t.integer "invitation_limit" - t.integer "invited_by_id" - t.string "invited_by_type" - t.string "authentication_token", :limit => 30 - t.string "unconfirmed_email" - t.string "confirm_email_token", :limit => 30 - t.datetime "locked_at" - t.boolean "show_community_spotlight_in_stream", :default => true, :null => false - t.boolean "auto_follow_back", :default => false - t.integer "auto_follow_back_aspect_id" - t.text "hidden_shareables" - t.datetime "reset_password_sent_at" - end - - add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true - add_index "users", ["email"], :name => "index_users_on_email", length: {"email" => "191"} - add_index 'users', ["invitation_service", "invitation_identifier"], :name => 'index_users_on_invitation_service_and_invitation_identifier', length: {"invitation_service"=>64, "invitation_identifier"=>127}, :using => :btree, :unique => true - add_index "users", ["invitation_token"], :name => "index_users_on_invitation_token" - add_index 'users', ["username"], :name => 'index_users_on_username', length: {"username"=>191}, :using => :btree, :unique => true - - add_foreign_key "aspect_memberships", "aspects", name: "aspect_memberships_aspect_id_fk", on_delete: :cascade - add_foreign_key "aspect_memberships", "contacts", name: "aspect_memberships_contact_id_fk", on_delete: :cascade - - add_foreign_key "aspect_visibilities", "aspects", name: "aspect_visibilities_aspect_id_fk", on_delete: :cascade - - add_foreign_key "comments", "people", name: "comments_author_id_fk", column: "author_id", on_delete: :cascade - - add_foreign_key "contacts", "people", name: "contacts_person_id_fk", on_delete: :cascade - - add_foreign_key "conversation_visibilities", "conversations", name: "conversation_visibilities_conversation_id_fk", on_delete: :cascade - add_foreign_key "conversation_visibilities", "people", name: "conversation_visibilities_person_id_fk", on_delete: :cascade - - add_foreign_key "conversations", "people", name: "conversations_author_id_fk", column: "author_id", on_delete: :cascade - - add_foreign_key "invitations", "users", name: "invitations_recipient_id_fk", column: "recipient_id", on_delete: :cascade - add_foreign_key "invitations", "users", name: "invitations_sender_id_fk", column: "sender_id", on_delete: :cascade - - add_foreign_key "likes", "people", name: "likes_author_id_fk", column: "author_id", on_delete: :cascade - - add_foreign_key "messages", "conversations", name: "messages_conversation_id_fk", on_delete: :cascade - add_foreign_key "messages", "people", name: "messages_author_id_fk", column: "author_id", on_delete: :cascade - - add_foreign_key "notification_actors", "notifications", name: "notification_actors_notification_id_fk", on_delete: :cascade - - add_foreign_key "posts", "people", name: "posts_author_id_fk", column: "author_id", on_delete: :cascade - - add_foreign_key "profiles", "people", name: "profiles_person_id_fk", on_delete: :cascade - - add_foreign_key "services", "users", name: "services_user_id_fk", on_delete: :cascade - - add_foreign_key "share_visibilities", "contacts", name: "post_visibilities_contact_id_fk", on_delete: :cascade + # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing end diff --git a/db/migrate/20130207231310_add_facebook_id_to_post.rb b/db/migrate/20130207231310_add_facebook_id_to_post.rb index df888dcca..f559f46a7 100644 --- a/db/migrate/20130207231310_add_facebook_id_to_post.rb +++ b/db/migrate/20130207231310_add_facebook_id_to_post.rb @@ -1,4 +1,4 @@ -class AddFacebookIdToPost < ActiveRecord::Migration +class AddFacebookIdToPost < ActiveRecord::Migration[4.2] def change add_column :posts, :facebook_id, :string end diff --git a/db/migrate/20130404211624_fix_default_image_url_from_profile.rb b/db/migrate/20130404211624_fix_default_image_url_from_profile.rb index 4749728fc..80618b8a5 100644 --- a/db/migrate/20130404211624_fix_default_image_url_from_profile.rb +++ b/db/migrate/20130404211624_fix_default_image_url_from_profile.rb @@ -1,4 +1,4 @@ -class FixDefaultImageUrlFromProfile < ActiveRecord::Migration +class FixDefaultImageUrlFromProfile < ActiveRecord::Migration[4.2] def up execute("UPDATE profiles SET image_url = REPLACE(image_url, 'images', 'assets'), image_url_small = REPLACE(image_url_small, 'images', 'assets'), image_url_medium = REPLACE(image_url_medium, 'images', 'assets') WHERE image_url LIKE '%images/user/default.png';") end diff --git a/db/migrate/20130429073928_add_tweet_id_to_post.rb b/db/migrate/20130429073928_add_tweet_id_to_post.rb index f62c2b964..7f9c5808f 100644 --- a/db/migrate/20130429073928_add_tweet_id_to_post.rb +++ b/db/migrate/20130429073928_add_tweet_id_to_post.rb @@ -1,4 +1,4 @@ -class AddTweetIdToPost < ActiveRecord::Migration +class AddTweetIdToPost < ActiveRecord::Migration[4.2] def change add_column :posts, :tweet_id, :string add_index :posts, ['tweet_id'], :length => { "tweet_id" => 191 } diff --git a/db/migrate/20130608171134_add_open_graph_cache.rb b/db/migrate/20130608171134_add_open_graph_cache.rb index ccf4aecc4..ac4826c1f 100644 --- a/db/migrate/20130608171134_add_open_graph_cache.rb +++ b/db/migrate/20130608171134_add_open_graph_cache.rb @@ -1,4 +1,4 @@ -class AddOpenGraphCache < ActiveRecord::Migration +class AddOpenGraphCache < ActiveRecord::Migration[4.2] def up create_table :open_graph_caches do |t| t.string :title diff --git a/db/migrate/20130613203350_remove_limit_from_root_guid_in_posts.rb b/db/migrate/20130613203350_remove_limit_from_root_guid_in_posts.rb index 97b653a10..2e88f0a1e 100644 --- a/db/migrate/20130613203350_remove_limit_from_root_guid_in_posts.rb +++ b/db/migrate/20130613203350_remove_limit_from_root_guid_in_posts.rb @@ -1,4 +1,4 @@ -class RemoveLimitFromRootGuidInPosts < ActiveRecord::Migration +class RemoveLimitFromRootGuidInPosts < ActiveRecord::Migration[4.2] def up remove_index 'posts', :name => 'index_posts_on_root_guid' remove_index 'posts', :name => 'index_posts_on_author_id_and_root_guid' diff --git a/db/migrate/20130717104359_migrate_activity_stream_to_status_message.rb b/db/migrate/20130717104359_migrate_activity_stream_to_status_message.rb index c02282f81..c37d8dd3e 100644 --- a/db/migrate/20130717104359_migrate_activity_stream_to_status_message.rb +++ b/db/migrate/20130717104359_migrate_activity_stream_to_status_message.rb @@ -1,5 +1,5 @@ -class MigrateActivityStreamToStatusMessage < ActiveRecord::Migration - class Post < ActiveRecord::Base; self.inheritance_column = false; end +class MigrateActivityStreamToStatusMessage < ActiveRecord::Migration[4.2] + class Post < ApplicationRecord; self.inheritance_column = false; end def up posts_stream_photos = Post.where(type: 'ActivityStreams::Photo') posts_stream_photos.each do |p| diff --git a/db/migrate/20130801063213_add_tumblr_post_ids_to_posts.rb b/db/migrate/20130801063213_add_tumblr_post_ids_to_posts.rb index e8ddb4877..638157388 100644 --- a/db/migrate/20130801063213_add_tumblr_post_ids_to_posts.rb +++ b/db/migrate/20130801063213_add_tumblr_post_ids_to_posts.rb @@ -1,4 +1,4 @@ -class AddTumblrPostIdsToPosts < ActiveRecord::Migration +class AddTumblrPostIdsToPosts < ActiveRecord::Migration[4.2] def change add_column :posts, :tumblr_ids, :text end diff --git a/db/migrate/20131017093025_create_post_reports.rb b/db/migrate/20131017093025_create_post_reports.rb index bb68ff896..5ccceca03 100644 --- a/db/migrate/20131017093025_create_post_reports.rb +++ b/db/migrate/20131017093025_create_post_reports.rb @@ -1,4 +1,4 @@ -class CreatePostReports < ActiveRecord::Migration +class CreatePostReports < ActiveRecord::Migration[4.2] def change create_table :post_reports do |t| t.integer :post_id, :null => false diff --git a/db/migrate/20131213171804_create_simple_captcha_data.rb b/db/migrate/20131213171804_create_simple_captcha_data.rb index 4573b2056..9068aec00 100644 --- a/db/migrate/20131213171804_create_simple_captcha_data.rb +++ b/db/migrate/20131213171804_create_simple_captcha_data.rb @@ -1,4 +1,4 @@ -class CreateSimpleCaptchaData < ActiveRecord::Migration +class CreateSimpleCaptchaData < ActiveRecord::Migration[4.2] def self.up create_table :simple_captcha_data do |t| t.string :key, :limit => 40 diff --git a/db/migrate/20140121132816_add_post_type_to_post_report.rb b/db/migrate/20140121132816_add_post_type_to_post_report.rb index 4d6686eea..766efb9b9 100644 --- a/db/migrate/20140121132816_add_post_type_to_post_report.rb +++ b/db/migrate/20140121132816_add_post_type_to_post_report.rb @@ -1,4 +1,4 @@ -class AddPostTypeToPostReport < ActiveRecord::Migration +class AddPostTypeToPostReport < ActiveRecord::Migration[4.2] def change add_column :post_reports, :post_type, :string, :null => false, :after => :post_id, :default => 'post' change_column_default :post_reports, :post_type, nil diff --git a/db/migrate/20140214104217_rename_post_report_to_report.rb b/db/migrate/20140214104217_rename_post_report_to_report.rb index 2d477491e..3b02b0aec 100644 --- a/db/migrate/20140214104217_rename_post_report_to_report.rb +++ b/db/migrate/20140214104217_rename_post_report_to_report.rb @@ -1,4 +1,4 @@ -class RenamePostReportToReport < ActiveRecord::Migration +class RenamePostReportToReport < ActiveRecord::Migration[4.2] def self.up rename_table :post_reports, :reports end diff --git a/db/migrate/20140222162826_devise_add_lastseenable_user.rb b/db/migrate/20140222162826_devise_add_lastseenable_user.rb index 5c62814af..c0a5428d4 100644 --- a/db/migrate/20140222162826_devise_add_lastseenable_user.rb +++ b/db/migrate/20140222162826_devise_add_lastseenable_user.rb @@ -1,4 +1,4 @@ -class DeviseAddLastseenableUser < ActiveRecord::Migration +class DeviseAddLastseenableUser < ActiveRecord::Migration[4.2] def self.up add_column :users, :last_seen, :datetime User.find_each do |user| diff --git a/db/migrate/20140308154022_create_polls.rb b/db/migrate/20140308154022_create_polls.rb index f2d84ba6a..c9dd794a2 100644 --- a/db/migrate/20140308154022_create_polls.rb +++ b/db/migrate/20140308154022_create_polls.rb @@ -1,4 +1,4 @@ -class CreatePolls < ActiveRecord::Migration +class CreatePolls < ActiveRecord::Migration[4.2] def up create_table :polls do |t| t.string :question, :null => false diff --git a/db/migrate/20140422134050_rename_post_columns_to_item.rb b/db/migrate/20140422134050_rename_post_columns_to_item.rb index 4550eacd7..986326152 100644 --- a/db/migrate/20140422134050_rename_post_columns_to_item.rb +++ b/db/migrate/20140422134050_rename_post_columns_to_item.rb @@ -1,4 +1,4 @@ -class RenamePostColumnsToItem < ActiveRecord::Migration +class RenamePostColumnsToItem < ActiveRecord::Migration[4.2] def up rename_column :reports, :post_id, :item_id rename_column :reports, :post_type, :item_type diff --git a/db/migrate/20140422134627_change_user_id_type_to_integer.rb b/db/migrate/20140422134627_change_user_id_type_to_integer.rb index 1f4918e8b..019cef962 100644 --- a/db/migrate/20140422134627_change_user_id_type_to_integer.rb +++ b/db/migrate/20140422134627_change_user_id_type_to_integer.rb @@ -1,4 +1,4 @@ -class ChangeUserIdTypeToInteger < ActiveRecord::Migration +class ChangeUserIdTypeToInteger < ActiveRecord::Migration[4.2] def up remove_column :reports, :user_id add_column :reports, :user_id, :integer, :null => false, :default => 1 diff --git a/db/migrate/20140601102543_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb b/db/migrate/20140601102543_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb index 8edb50807..5a3f71a25 100644 --- a/db/migrate/20140601102543_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +++ b/db/migrate/20140601102543_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb @@ -1,5 +1,5 @@ # This migration comes from acts_as_taggable_on_engine (originally 3) -class AddTaggingsCounterCacheToTags < ActiveRecord::Migration +class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[4.2] def self.up add_column :tags, :taggings_count, :integer, default: 0 diff --git a/db/migrate/20140801101230_create_chat_contacts.rb b/db/migrate/20140801101230_create_chat_contacts.rb index 718b5ae8d..b50afcece 100644 --- a/db/migrate/20140801101230_create_chat_contacts.rb +++ b/db/migrate/20140801101230_create_chat_contacts.rb @@ -1,4 +1,4 @@ -class CreateChatContacts < ActiveRecord::Migration +class CreateChatContacts < ActiveRecord::Migration[4.2] def up create_table :chat_contacts do |t| t.integer :user_id, null: false diff --git a/db/migrate/20140801101352_create_chat_fragments.rb b/db/migrate/20140801101352_create_chat_fragments.rb index 0fbdc40ee..0457abf22 100644 --- a/db/migrate/20140801101352_create_chat_fragments.rb +++ b/db/migrate/20140801101352_create_chat_fragments.rb @@ -1,4 +1,4 @@ -class CreateChatFragments < ActiveRecord::Migration +class CreateChatFragments < ActiveRecord::Migration[4.2] def up create_table :chat_fragments do |t| t.integer :user_id, null: false diff --git a/db/migrate/20140824230505_add_completed_at_to_account_deletions.rb b/db/migrate/20140824230505_add_completed_at_to_account_deletions.rb index 9b2af8c6a..2c701dcac 100644 --- a/db/migrate/20140824230505_add_completed_at_to_account_deletions.rb +++ b/db/migrate/20140824230505_add_completed_at_to_account_deletions.rb @@ -1,4 +1,4 @@ -class AddCompletedAtToAccountDeletions < ActiveRecord::Migration +class AddCompletedAtToAccountDeletions < ActiveRecord::Migration[4.2] def change add_column :account_deletions, :completed_at, :datetime end diff --git a/db/migrate/20140826165533_increase_simple_captcha_limit.rb b/db/migrate/20140826165533_increase_simple_captcha_limit.rb index b4d43dd64..c0d7d4827 100644 --- a/db/migrate/20140826165533_increase_simple_captcha_limit.rb +++ b/db/migrate/20140826165533_increase_simple_captcha_limit.rb @@ -1,4 +1,4 @@ -class IncreaseSimpleCaptchaLimit < ActiveRecord::Migration +class IncreaseSimpleCaptchaLimit < ActiveRecord::Migration[4.2] def self.up change_column :simple_captcha_data, :value, :string, :limit => 12 end diff --git a/db/migrate/20140906192846_fix_open_graph_data.rb b/db/migrate/20140906192846_fix_open_graph_data.rb index 54959931d..5aec2b531 100644 --- a/db/migrate/20140906192846_fix_open_graph_data.rb +++ b/db/migrate/20140906192846_fix_open_graph_data.rb @@ -1,4 +1,4 @@ -class FixOpenGraphData < ActiveRecord::Migration +class FixOpenGraphData < ActiveRecord::Migration[4.2] def self.up change_column :open_graph_caches, :url, :text change_column :open_graph_caches, :image, :text diff --git a/db/migrate/20141001162851_add_remove_after_to_users.rb b/db/migrate/20141001162851_add_remove_after_to_users.rb index c63b916b6..8169e5e8b 100644 --- a/db/migrate/20141001162851_add_remove_after_to_users.rb +++ b/db/migrate/20141001162851_add_remove_after_to_users.rb @@ -1,4 +1,4 @@ -class AddRemoveAfterToUsers < ActiveRecord::Migration +class AddRemoveAfterToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :remove_after, :datetime end diff --git a/db/migrate/20141007003922_add_chat_enabled_to_aspects.rb b/db/migrate/20141007003922_add_chat_enabled_to_aspects.rb index ba4fd31fc..a5e300b94 100644 --- a/db/migrate/20141007003922_add_chat_enabled_to_aspects.rb +++ b/db/migrate/20141007003922_add_chat_enabled_to_aspects.rb @@ -1,4 +1,4 @@ -class AddChatEnabledToAspects < ActiveRecord::Migration +class AddChatEnabledToAspects < ActiveRecord::Migration[4.2] def self.up add_column :aspects, :chat_enabled, :boolean, default: false end diff --git a/db/migrate/20141024170120_create_chat_offline_messages.rb b/db/migrate/20141024170120_create_chat_offline_messages.rb index 8c30101b0..5c31e632d 100644 --- a/db/migrate/20141024170120_create_chat_offline_messages.rb +++ b/db/migrate/20141024170120_create_chat_offline_messages.rb @@ -1,4 +1,4 @@ -class CreateChatOfflineMessages < ActiveRecord::Migration +class CreateChatOfflineMessages < ActiveRecord::Migration[4.2] def self.up create_table :chat_offline_messages do |t| t.string :from, :null => false diff --git a/db/migrate/20141209041241_drop_open_graph_caches_with_invalid_urls.rb b/db/migrate/20141209041241_drop_open_graph_caches_with_invalid_urls.rb index bfbfab884..1c2b3dbf7 100644 --- a/db/migrate/20141209041241_drop_open_graph_caches_with_invalid_urls.rb +++ b/db/migrate/20141209041241_drop_open_graph_caches_with_invalid_urls.rb @@ -1,4 +1,4 @@ -class DropOpenGraphCachesWithInvalidUrls < ActiveRecord::Migration +class DropOpenGraphCachesWithInvalidUrls < ActiveRecord::Migration[4.2] def up OpenGraphCache.where(url: 'http://').delete_all end diff --git a/db/migrate/20141216213423_purge_orphan_conversations.rb b/db/migrate/20141216213423_purge_orphan_conversations.rb index c5eb90bff..45e6f5856 100644 --- a/db/migrate/20141216213423_purge_orphan_conversations.rb +++ b/db/migrate/20141216213423_purge_orphan_conversations.rb @@ -1,4 +1,4 @@ -class PurgeOrphanConversations < ActiveRecord::Migration +class PurgeOrphanConversations < ActiveRecord::Migration[4.2] def up Conversation.where(id: Conversation.joins("LEFT JOIN conversation_visibilities ON conversation_visibilities.conversation_id = conversations.id") .group('conversations.id') diff --git a/db/migrate/20141227120907_add_export_to_user.rb b/db/migrate/20141227120907_add_export_to_user.rb index 376d5fe36..ef1779f76 100644 --- a/db/migrate/20141227120907_add_export_to_user.rb +++ b/db/migrate/20141227120907_add_export_to_user.rb @@ -1,4 +1,4 @@ -class AddExportToUser < ActiveRecord::Migration +class AddExportToUser < ActiveRecord::Migration[4.2] def change add_column :users, :export, :string add_column :users, :exported_at, :datetime diff --git a/db/migrate/20141230214830_user_pref_strip_exif.rb b/db/migrate/20141230214830_user_pref_strip_exif.rb index 79983181d..b573d4874 100644 --- a/db/migrate/20141230214830_user_pref_strip_exif.rb +++ b/db/migrate/20141230214830_user_pref_strip_exif.rb @@ -1,4 +1,4 @@ -class UserPrefStripExif < ActiveRecord::Migration +class UserPrefStripExif < ActiveRecord::Migration[4.2] def up add_column :users, :strip_exif, :boolean, default: true end diff --git a/db/migrate/20150106050733_set_mysql_to_unicode_mb4.rb b/db/migrate/20150106050733_set_mysql_to_unicode_mb4.rb deleted file mode 100644 index 37dd9373e..000000000 --- a/db/migrate/20150106050733_set_mysql_to_unicode_mb4.rb +++ /dev/null @@ -1,113 +0,0 @@ -class SetMysqlToUnicodeMb4 < ActiveRecord::Migration - # Converts the tables and strings columns to utf8mb4, which is the true, full - # unicode support in MySQl - - def self.up - # shorten indexes regardless of the RDBMS provider - for consitency - shorten_indexes - change_encoding('utf8mb4', 'utf8mb4_bin') if AppConfig.mysql? - end - - def self.down - change_encoding('utf8', 'utf8_bin') if AppConfig.mysql? - end - - def check_config(encoding, collation) - connection_config = ActiveRecord::Base.connection_config - raise "Database encoding is not #{encoding}!" if connection_config[:encoding] != encoding - raise "Database collation is not #{collation}!" if connection_config[:collation] != collation - end - - def change_encoding(encoding, collation) - # Make sure the podmin changed the database.yml file - check_config(encoding, collation) - - execute "ALTER DATABASE `#{ActiveRecord::Base.connection.current_database}` CHARACTER SET #{encoding} COLLATE #{collation};" - - tables.each do |table| - - modify_text_columns = columns(table).select {|column| column.type == :text }.map {|column| - "MODIFY `#{column.name}` TEXT #{'NOT' unless column.null } NULL#{" DEFAULT '#{column.default}'" if column.has_default?}" - }.join(", ") - - execute "ALTER TABLE `#{table}` CONVERT TO CHARACTER SET #{encoding} COLLATE #{collation}#{", #{modify_text_columns}" unless modify_text_columns.empty?};" - end - end - - def shorten_indexes - remove_index 'aspect_visibilities', :name => 'shareable_and_aspect_id' - add_index 'aspect_visibilities', ["shareable_id", "shareable_type", "aspect_id"], :name => 'shareable_and_aspect_id', length: {"shareable_type"=>189}, :using => :btree - - remove_index 'aspect_visibilities', :name => 'index_aspect_visibilities_on_shareable_id_and_shareable_type' - add_index 'aspect_visibilities', ["shareable_id", "shareable_type"], :name => 'index_aspect_visibilities_on_shareable_id_and_shareable_type', length: {"shareable_type"=>190}, :using => :btree - - remove_index 'chat_contacts', :name => 'index_chat_contacts_on_user_id_and_jid' - add_index 'chat_contacts', ["user_id", "jid"], :name => 'index_chat_contacts_on_user_id_and_jid', length: {"jid"=>190}, :using => :btree, :unique => true - - remove_index 'comments', :name => 'index_comments_on_guid' - add_index 'comments', ["guid"], :name => 'index_comments_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - - remove_index 'likes', :name => 'index_likes_on_guid' - add_index 'likes', ["guid"], :name => 'index_likes_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - - remove_index 'o_embed_caches', :name => 'index_o_embed_caches_on_url' - add_index 'o_embed_caches', ["url"], :name => 'index_o_embed_caches_on_url', length: {"url"=>191}, :using => :btree - - remove_index 'participations', :name => 'index_participations_on_guid' - add_index 'participations', ["guid"], :name => 'index_participations_on_guid', length: {"guid"=>191}, :using => :btree - - remove_index 'people', :name => 'index_people_on_diaspora_handle' - add_index "people", ["diaspora_handle"], :name => "index_people_on_diaspora_handle", :unique => true, :length => {"diaspora_handle" => 191} - - remove_index 'people', :name => 'index_people_on_guid' - add_index 'people', ["guid"], :name => 'index_people_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - - remove_index 'photos', :name => 'index_photos_on_status_message_guid' - add_index 'photos', ["status_message_guid"], :name => 'index_photos_on_status_message_guid', length: {"status_message_guid"=>191}, :using => :btree - - remove_index 'posts', :name => 'index_posts_on_guid' - add_index 'posts', ["guid"], :name => 'index_posts_on_guid', length: {"guid"=>191}, :using => :btree, :unique => true - - remove_index 'posts', :name => 'index_posts_on_status_message_guid_and_pending' - add_index 'posts', ["status_message_guid", "pending"], :name => 'index_posts_on_status_message_guid_and_pending', length: {"status_message_guid"=>190}, :using => :btree - - remove_index 'posts', :name => 'index_posts_on_status_message_guid' - add_index 'posts', ["status_message_guid"], :name => 'index_posts_on_status_message_guid', length: {"status_message_guid"=>191}, :using => :btree - - remove_index 'posts', :name => 'index_posts_on_author_id_and_root_guid' - add_index 'posts', ["author_id", "root_guid"], :name => 'index_posts_on_author_id_and_root_guid', length: {"root_guid"=>190}, :using => :btree, :unique => true - - remove_index 'posts', :name => 'index_posts_on_root_guid' - add_index 'posts', ["root_guid"], :name => 'index_posts_on_root_guid', length: {"root_guid"=>191} - - remove_index 'posts', :name => 'index_posts_on_tweet_id' - add_index 'posts', ['tweet_id'], :name => 'index_posts_on_tweet_id', length: {"tweet_id"=>191}, :using => :btree - - remove_index 'rails_admin_histories', :name => 'index_rails_admin_histories' - add_index 'rails_admin_histories', ["item", "table", "month", "year"], :name => 'index_rails_admin_histories', length: {"table"=>188}, :using => :btree - - remove_index 'schema_migrations', :name => 'unique_schema_migrations' - add_index 'schema_migrations', ["version"], :name => 'unique_schema_migrations', length: {"version"=>191}, :using => :btree - - remove_index 'services', :name => 'index_services_on_type_and_uid' - add_index 'services', ["type", "uid"], :name => 'index_services_on_type_and_uid', length: {"type"=>64, "uid"=>127}, :using => :btree - - remove_index 'taggings', :name => 'index_taggings_on_taggable_id_and_taggable_type_and_context' - add_index 'taggings', ["taggable_id", "taggable_type", "context"], :name => 'index_taggings_on_taggable_id_and_taggable_type_and_context', length: {"taggable_type"=>95, "context"=>95}, :using => :btree - - remove_index 'tags', :name => 'index_tags_on_name' - add_index 'tags', ["name"], :name => 'index_tags_on_name', length: {"name"=>191}, :using => :btree, :unique => true - - remove_index 'users', :name => 'index_users_on_invitation_service_and_invitation_identifier' - add_index 'users', ["invitation_service", "invitation_identifier"], :name => 'index_users_on_invitation_service_and_invitation_identifier', length: {"invitation_service"=>64, "invitation_identifier"=>127}, :using => :btree, :unique => true - - remove_index 'users', :name => 'index_users_on_username' - add_index 'users', ["username"], :name => 'index_users_on_username', length: {"username"=>191}, :using => :btree, :unique => true - - remove_index 'users', :name => 'index_users_on_email' - add_index 'users', ["email"], :name => 'index_users_on_email', length: {"email"=>191}, :using => :btree - - remove_index 'notifications', :name => 'index_notifications_on_target_type_and_target_id' - add_index 'notifications', ["target_type", "target_id"], name: 'index_notifications_on_target_type_and_target_id', length: {"target_type"=>190}, using: :btree - end -end diff --git a/db/migrate/20150209230946_disable_mail_for_closed_account.rb b/db/migrate/20150209230946_disable_mail_for_closed_account.rb index 575b16cfc..2dd573745 100644 --- a/db/migrate/20150209230946_disable_mail_for_closed_account.rb +++ b/db/migrate/20150209230946_disable_mail_for_closed_account.rb @@ -1,4 +1,4 @@ -class DisableMailForClosedAccount < ActiveRecord::Migration +class DisableMailForClosedAccount < ActiveRecord::Migration[4.2] def up User.joins(:person).where(people: {closed_account: true}).update_all(disable_mail: true) end diff --git a/db/migrate/20150220001357_add_photos_export_to_user.rb b/db/migrate/20150220001357_add_photos_export_to_user.rb index f19349723..6bec80420 100644 --- a/db/migrate/20150220001357_add_photos_export_to_user.rb +++ b/db/migrate/20150220001357_add_photos_export_to_user.rb @@ -1,4 +1,4 @@ -class AddPhotosExportToUser < ActiveRecord::Migration +class AddPhotosExportToUser < ActiveRecord::Migration[4.2] def up add_column :users, :exported_photos_file, :string add_column :users, :exported_photos_at, :datetime diff --git a/db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb b/db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb index d0d12058d..f5f19e750 100644 --- a/db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb +++ b/db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb @@ -1,4 +1,4 @@ -class RemoveDeletedAspectsFromAutoFollowBack < ActiveRecord::Migration +class RemoveDeletedAspectsFromAutoFollowBack < ActiveRecord::Migration[4.2] def up User.where.not(auto_follow_back_aspect_id: Aspect.select(:id)) .where(auto_follow_back: true) diff --git a/db/migrate/20150403212139_fix_wrong_only_sharing.rb b/db/migrate/20150403212139_fix_wrong_only_sharing.rb index 8299ea88b..c02f4bba6 100644 --- a/db/migrate/20150403212139_fix_wrong_only_sharing.rb +++ b/db/migrate/20150403212139_fix_wrong_only_sharing.rb @@ -1,4 +1,4 @@ -class FixWrongOnlySharing < ActiveRecord::Migration +class FixWrongOnlySharing < ActiveRecord::Migration[4.2] def up Contact.where(sharing: true, receiving: false) .where(id: AspectMembership.select(:contact_id)) diff --git a/db/migrate/20150523004437_enable_color_themes.rb b/db/migrate/20150523004437_enable_color_themes.rb index d9cea868d..816fd1fbf 100644 --- a/db/migrate/20150523004437_enable_color_themes.rb +++ b/db/migrate/20150523004437_enable_color_themes.rb @@ -1,4 +1,4 @@ -class EnableColorThemes < ActiveRecord::Migration +class EnableColorThemes < ActiveRecord::Migration[4.2] def up add_column(:users, :color_theme, :string) end diff --git a/db/migrate/20150531005120_cleanup_default_avatars.rb b/db/migrate/20150531005120_cleanup_default_avatars.rb index 93010fb2a..f3dcee9a2 100644 --- a/db/migrate/20150531005120_cleanup_default_avatars.rb +++ b/db/migrate/20150531005120_cleanup_default_avatars.rb @@ -1,4 +1,4 @@ -class CleanupDefaultAvatars < ActiveRecord::Migration +class CleanupDefaultAvatars < ActiveRecord::Migration[4.2] def up Profile.where("image_url LIKE ?", "%user/default%") .update_all(image_url: nil, image_url_small: nil, image_url_medium: nil) diff --git a/db/migrate/20150607143809_fix_photo_public_flag.rb b/db/migrate/20150607143809_fix_photo_public_flag.rb index fa75167ef..ee223cd6a 100644 --- a/db/migrate/20150607143809_fix_photo_public_flag.rb +++ b/db/migrate/20150607143809_fix_photo_public_flag.rb @@ -1,4 +1,4 @@ -class FixPhotoPublicFlag < ActiveRecord::Migration +class FixPhotoPublicFlag < ActiveRecord::Migration[4.2] def up Photo.joins(:status_message).where(posts: {public: true}).update_all(public: true) end diff --git a/db/migrate/20150613202109_create_o_auth_applications.rb b/db/migrate/20150613202109_create_o_auth_applications.rb index 1170b5c9e..a39f0ace9 100644 --- a/db/migrate/20150613202109_create_o_auth_applications.rb +++ b/db/migrate/20150613202109_create_o_auth_applications.rb @@ -1,6 +1,6 @@ # Inspired by https://github.com/nov/openid_connect_sample/blob/master/db/migrate/20110829023826_create_clients.rb -class CreateOAuthApplications < ActiveRecord::Migration +class CreateOAuthApplications < ActiveRecord::Migration[4.2] def change create_table :o_auth_applications do |t| t.belongs_to :user, index: true diff --git a/db/migrate/20150630221004_add_public_to_profiles.rb b/db/migrate/20150630221004_add_public_to_profiles.rb index 06973e027..4797c1f38 100644 --- a/db/migrate/20150630221004_add_public_to_profiles.rb +++ b/db/migrate/20150630221004_add_public_to_profiles.rb @@ -1,4 +1,4 @@ -class AddPublicToProfiles < ActiveRecord::Migration +class AddPublicToProfiles < ActiveRecord::Migration[4.2] def change add_column :profiles, :public_details, :boolean, default: false end diff --git a/db/migrate/20150708153926_create_authorizations.rb b/db/migrate/20150708153926_create_authorizations.rb index ee88ab017..b9e06dd2c 100644 --- a/db/migrate/20150708153926_create_authorizations.rb +++ b/db/migrate/20150708153926_create_authorizations.rb @@ -1,4 +1,4 @@ -class CreateAuthorizations < ActiveRecord::Migration +class CreateAuthorizations < ActiveRecord::Migration[4.2] def change create_table :authorizations do |t| t.belongs_to :user, index: true diff --git a/db/migrate/20150708153928_create_o_auth_access_tokens.rb b/db/migrate/20150708153928_create_o_auth_access_tokens.rb index d833011c5..779283cbe 100644 --- a/db/migrate/20150708153928_create_o_auth_access_tokens.rb +++ b/db/migrate/20150708153928_create_o_auth_access_tokens.rb @@ -1,6 +1,6 @@ # Inspired by https://github.com/nov/openid_connect_sample/blob/master/db/migrate/20110829023837_create_access_tokens.rb -class CreateOAuthAccessTokens < ActiveRecord::Migration +class CreateOAuthAccessTokens < ActiveRecord::Migration[4.2] def change create_table :o_auth_access_tokens do |t| t.belongs_to :authorization, index: true diff --git a/db/migrate/20150714055110_create_id_tokens.rb b/db/migrate/20150714055110_create_id_tokens.rb index b1e3abdfa..df98206a4 100644 --- a/db/migrate/20150714055110_create_id_tokens.rb +++ b/db/migrate/20150714055110_create_id_tokens.rb @@ -1,6 +1,6 @@ # Inspired by https://github.com/nov/openid_connect_sample/blob/master/db/migrate/20110829024010_create_id_tokens.rb -class CreateIdTokens < ActiveRecord::Migration +class CreateIdTokens < ActiveRecord::Migration[4.2] def change create_table :id_tokens do |t| t.belongs_to :authorization, index: true diff --git a/db/migrate/20150724152052_remove_favorites_from_posts.rb b/db/migrate/20150724152052_remove_favorites_from_posts.rb index 8d4bd873f..737d3c593 100644 --- a/db/migrate/20150724152052_remove_favorites_from_posts.rb +++ b/db/migrate/20150724152052_remove_favorites_from_posts.rb @@ -1,4 +1,4 @@ -class RemoveFavoritesFromPosts < ActiveRecord::Migration +class RemoveFavoritesFromPosts < ActiveRecord::Migration[4.2] def self.up remove_column :posts, :favorite end diff --git a/db/migrate/20150731123113_create_pairwise_pseudonymous_identifiers.rb b/db/migrate/20150731123113_create_pairwise_pseudonymous_identifiers.rb index 0c8690848..12ed8597f 100644 --- a/db/migrate/20150731123113_create_pairwise_pseudonymous_identifiers.rb +++ b/db/migrate/20150731123113_create_pairwise_pseudonymous_identifiers.rb @@ -1,6 +1,6 @@ # Inspired by https://github.com/nov/openid_connect_sample/blob/master/db/migrate/20110829024140_create_pairwise_pseudonymous_identifiers.rb -class CreatePairwisePseudonymousIdentifiers < ActiveRecord::Migration +class CreatePairwisePseudonymousIdentifiers < ActiveRecord::Migration[4.2] def change create_table :ppid do |t| t.belongs_to :o_auth_application, index: true diff --git a/db/migrate/20150731123114_add_status_to_pods.rb b/db/migrate/20150731123114_add_status_to_pods.rb index b53051f06..e94a011b1 100644 --- a/db/migrate/20150731123114_add_status_to_pods.rb +++ b/db/migrate/20150731123114_add_status_to_pods.rb @@ -1,4 +1,4 @@ -class AddStatusToPods < ActiveRecord::Migration +class AddStatusToPods < ActiveRecord::Migration[4.2] def change add_column :pods, :status, :integer, default: 0 add_column :pods, :checked_at, :datetime, default: Time.zone.at(0) diff --git a/db/migrate/20150828132451_remove_duplicate_and_empty_pods.rb b/db/migrate/20150828132451_remove_duplicate_and_empty_pods.rb index e93acf722..f3d434474 100644 --- a/db/migrate/20150828132451_remove_duplicate_and_empty_pods.rb +++ b/db/migrate/20150828132451_remove_duplicate_and_empty_pods.rb @@ -1,4 +1,4 @@ -class RemoveDuplicateAndEmptyPods < ActiveRecord::Migration +class RemoveDuplicateAndEmptyPods < ActiveRecord::Migration[4.2] def up remove_dupes remove_empty_or_nil diff --git a/db/migrate/20151003142048_update_report_item_types.rb b/db/migrate/20151003142048_update_report_item_types.rb index 9a318edff..3d4972537 100644 --- a/db/migrate/20151003142048_update_report_item_types.rb +++ b/db/migrate/20151003142048_update_report_item_types.rb @@ -1,4 +1,4 @@ -class UpdateReportItemTypes < ActiveRecord::Migration +class UpdateReportItemTypes < ActiveRecord::Migration[4.2] def change Report.all.each do |report| report.update_attribute :item_type, report[:item_type].capitalize diff --git a/db/migrate/20151210213023_remove_signatures_from_relayables.rb b/db/migrate/20151210213023_remove_signatures_from_relayables.rb index 1d2cb485c..c9b7a45fa 100644 --- a/db/migrate/20151210213023_remove_signatures_from_relayables.rb +++ b/db/migrate/20151210213023_remove_signatures_from_relayables.rb @@ -1,4 +1,4 @@ -class RemoveSignaturesFromRelayables < ActiveRecord::Migration +class RemoveSignaturesFromRelayables < ActiveRecord::Migration[4.2] def change remove_column :comments, :parent_author_signature, :text remove_column :poll_participations, :parent_author_signature, :text diff --git a/db/migrate/20160124234712_extend_pods.rb b/db/migrate/20160124234712_extend_pods.rb index 17fb6c215..9f2dc7ebc 100644 --- a/db/migrate/20160124234712_extend_pods.rb +++ b/db/migrate/20160124234712_extend_pods.rb @@ -1,5 +1,5 @@ -class ExtendPods < ActiveRecord::Migration - class Pod < ActiveRecord::Base +class ExtendPods < ActiveRecord::Migration[4.2] + class Pod < ApplicationRecord has_many :people DEFAULT_PORTS = [URI::HTTP::DEFAULT_PORT, URI::HTTPS::DEFAULT_PORT] @@ -18,7 +18,7 @@ class ExtendPods < ActiveRecord::Migration end end - class Person < ActiveRecord::Base + class Person < ApplicationRecord belongs_to :owner, class_name: "User" belongs_to :pod @@ -27,7 +27,7 @@ class ExtendPods < ActiveRecord::Migration end end - class User < ActiveRecord::Base + class User < ApplicationRecord has_one :person, inverse_of: :owner, foreign_key: :owner_id end @@ -52,7 +52,7 @@ class ExtendPods < ActiveRecord::Migration end # cleanup unused pods - Pod.joins("LEFT OUTER JOIN people ON pods.id = people.pod_id").delete_all("people.id is NULL") + Pod.joins("LEFT OUTER JOIN people ON pods.id = people.pod_id").where("people.id is NULL").delete_all remove_column :people, :url end diff --git a/db/migrate/20160225232049_link_share_visibilities_with_user.rb b/db/migrate/20160225232049_link_share_visibilities_with_user.rb index 3292b0503..8a6f0f5ea 100644 --- a/db/migrate/20160225232049_link_share_visibilities_with_user.rb +++ b/db/migrate/20160225232049_link_share_visibilities_with_user.rb @@ -1,5 +1,5 @@ -class LinkShareVisibilitiesWithUser < ActiveRecord::Migration - class ShareVisibility < ActiveRecord::Base +class LinkShareVisibilitiesWithUser < ActiveRecord::Migration[4.2] + class ShareVisibility < ApplicationRecord end def up @@ -26,7 +26,7 @@ class LinkShareVisibilitiesWithUser < ActiveRecord::Migration remove_column :share_visibilities, :contact_id ShareVisibility.joins("LEFT OUTER JOIN users ON users.id = share_visibilities.user_id") - .delete_all("users.id is NULL") + .where("users.id is NULL").delete_all change_column :share_visibilities, :user_id, :integer, null: false @@ -73,8 +73,8 @@ class LinkShareVisibilitiesWithUser < ActiveRecord::Migration def cleanup_deleted_share_visibilities ShareVisibility.joins("LEFT OUTER JOIN posts ON posts.id = share_visibilities.shareable_id") - .where(shareable_type: "Post").delete_all("posts.id is NULL") + .where(shareable_type: "Post").where("posts.id is NULL").delete_all ShareVisibility.joins("LEFT OUTER JOIN photos ON photos.id = share_visibilities.shareable_id") - .where(shareable_type: "Photo").delete_all("photos.id is NULL") + .where(shareable_type: "Photo").where("photos.id is NULL").delete_all end end diff --git a/db/migrate/20160302025129_cleanup_aspect_visibility.rb b/db/migrate/20160302025129_cleanup_aspect_visibility.rb index c937ac4df..7d3ae9c5f 100644 --- a/db/migrate/20160302025129_cleanup_aspect_visibility.rb +++ b/db/migrate/20160302025129_cleanup_aspect_visibility.rb @@ -1,16 +1,16 @@ -class CleanupAspectVisibility < ActiveRecord::Migration - class AspectVisibility < ActiveRecord::Base +class CleanupAspectVisibility < ActiveRecord::Migration[4.2] + class AspectVisibility < ApplicationRecord end def up AspectVisibility.joins("LEFT OUTER JOIN posts ON posts.id = aspect_visibilities.shareable_id") - .where(shareable_type: "Post").delete_all("posts.id is NULL") + .where(shareable_type: "Post").where("posts.id is NULL").delete_all AspectVisibility.joins("LEFT OUTER JOIN photos ON photos.id = aspect_visibilities.shareable_id") - .where(shareable_type: "Photo").delete_all("photos.id is NULL") + .where(shareable_type: "Photo").where("photos.id is NULL").delete_all AspectVisibility.joins("INNER JOIN posts ON posts.id = aspect_visibilities.shareable_id") - .where(shareable_type: "Post").delete_all(posts: {public: true}) + .where(shareable_type: "Post").where(posts: {public: true}).delete_all AspectVisibility.joins("INNER JOIN photos ON photos.id = aspect_visibilities.shareable_id") - .where(shareable_type: "Photo").delete_all(photos: {public: true}) + .where(shareable_type: "Photo").where(photos: {public: true}).delete_all remove_columns :aspect_visibilities, :created_at, :updated_at end diff --git a/db/migrate/20160307142216_cleanup_handles.rb b/db/migrate/20160307142216_cleanup_handles.rb index b2ed8fc8a..e39be2279 100644 --- a/db/migrate/20160307142216_cleanup_handles.rb +++ b/db/migrate/20160307142216_cleanup_handles.rb @@ -1,4 +1,4 @@ -class CleanupHandles < ActiveRecord::Migration +class CleanupHandles < ActiveRecord::Migration[4.2] def change remove_column :photos, :tmp_old_id, :integer remove_column :photos, :diaspora_handle, :string diff --git a/db/migrate/20160327103605_add_author_id_index_to_participations.rb b/db/migrate/20160327103605_add_author_id_index_to_participations.rb index 8a6382aeb..c41607981 100644 --- a/db/migrate/20160327103605_add_author_id_index_to_participations.rb +++ b/db/migrate/20160327103605_add_author_id_index_to_participations.rb @@ -1,4 +1,4 @@ -class AddAuthorIdIndexToParticipations < ActiveRecord::Migration +class AddAuthorIdIndexToParticipations < ActiveRecord::Migration[4.2] def change add_index :participations, :author_id, :using => :btree end diff --git a/db/migrate/20160509232726_cleanup_duplicates_and_add_unique_indexes.rb b/db/migrate/20160509232726_cleanup_duplicates_and_add_unique_indexes.rb index 26b79067b..4e17deb71 100644 --- a/db/migrate/20160509232726_cleanup_duplicates_and_add_unique_indexes.rb +++ b/db/migrate/20160509232726_cleanup_duplicates_and_add_unique_indexes.rb @@ -1,4 +1,4 @@ -class CleanupDuplicatesAndAddUniqueIndexes < ActiveRecord::Migration +class CleanupDuplicatesAndAddUniqueIndexes < ActiveRecord::Migration[4.2] def up # temporary index to speed up the migration add_index :photos, :guid, length: 191 diff --git a/db/migrate/20160531170531_remove_duplicate_aspect_visibilities.rb b/db/migrate/20160531170531_remove_duplicate_aspect_visibilities.rb index 8269606be..40306c898 100644 --- a/db/migrate/20160531170531_remove_duplicate_aspect_visibilities.rb +++ b/db/migrate/20160531170531_remove_duplicate_aspect_visibilities.rb @@ -1,4 +1,4 @@ -class RemoveDuplicateAspectVisibilities < ActiveRecord::Migration +class RemoveDuplicateAspectVisibilities < ActiveRecord::Migration[4.2] def up where = "WHERE a1.aspect_id = a2.aspect_id AND a1.shareable_id = a2.shareable_id AND "\ "a1.shareable_type = a2.shareable_type AND a1.id > a2.id" diff --git a/db/migrate/20160618033455_cleanup_participations.rb b/db/migrate/20160618033455_cleanup_participations.rb index ffe857885..df27d04a7 100644 --- a/db/migrate/20160618033455_cleanup_participations.rb +++ b/db/migrate/20160618033455_cleanup_participations.rb @@ -1,5 +1,5 @@ -class CleanupParticipations < ActiveRecord::Migration - class Participation < ActiveRecord::Base +class CleanupParticipations < ActiveRecord::Migration[4.2] + class Participation < ApplicationRecord end def up @@ -39,6 +39,6 @@ class CleanupParticipations < ActiveRecord::Migration end Participation.joins("LEFT OUTER JOIN posts ON posts.id = participations.target_id") - .where(target_type: "Post").delete_all("posts.id is NULL") + .where(target_type: "Post").where("posts.id is NULL").delete_all end end diff --git a/db/migrate/20160720212620_create_signature_tables.rb b/db/migrate/20160720212620_create_signature_tables.rb index f9e2d6c05..fa843fcdd 100644 --- a/db/migrate/20160720212620_create_signature_tables.rb +++ b/db/migrate/20160720212620_create_signature_tables.rb @@ -1,5 +1,5 @@ -class CreateSignatureTables < ActiveRecord::Migration - class SignatureOrder < ActiveRecord::Base +class CreateSignatureTables < ActiveRecord::Migration[4.2] + class SignatureOrder < ApplicationRecord end RELAYABLES = %i(comment like poll_participation).freeze diff --git a/db/migrate/20160802212635_cleanup_posts_table.rb b/db/migrate/20160802212635_cleanup_posts_table.rb index 79e473e8e..ffab18c7d 100644 --- a/db/migrate/20160802212635_cleanup_posts_table.rb +++ b/db/migrate/20160802212635_cleanup_posts_table.rb @@ -1,4 +1,4 @@ -class CleanupPostsTable < ActiveRecord::Migration +class CleanupPostsTable < ActiveRecord::Migration[4.2] def change remove_index :posts, column: %i(status_message_guid pending), name: :index_posts_on_status_message_guid_and_pending, length: {status_message_guid: 190} diff --git a/db/migrate/20160807212443_participation_counter.rb b/db/migrate/20160807212443_participation_counter.rb index 871a1197f..719458ec7 100644 --- a/db/migrate/20160807212443_participation_counter.rb +++ b/db/migrate/20160807212443_participation_counter.rb @@ -1,18 +1,18 @@ -class ParticipationCounter < ActiveRecord::Migration - class Comment < ActiveRecord::Base +class ParticipationCounter < ActiveRecord::Migration[4.2] + class Comment < ApplicationRecord end - class Like < ActiveRecord::Base + class Like < ApplicationRecord end - class Participation < ActiveRecord::Base + class Participation < ApplicationRecord belongs_to :author, class_name: "Person" end - class Poll < ActiveRecord::Base + class Poll < ApplicationRecord end - class PollParticipation < ActiveRecord::Base + class PollParticipation < ApplicationRecord belongs_to :poll end diff --git a/db/migrate/20160810230114_cleanup_invitation_columns_from_users.rb b/db/migrate/20160810230114_cleanup_invitation_columns_from_users.rb index f51312b2f..2022589fc 100644 --- a/db/migrate/20160810230114_cleanup_invitation_columns_from_users.rb +++ b/db/migrate/20160810230114_cleanup_invitation_columns_from_users.rb @@ -1,8 +1,8 @@ -class CleanupInvitationColumnsFromUsers < ActiveRecord::Migration - class InvitationCode < ActiveRecord::Base +class CleanupInvitationColumnsFromUsers < ActiveRecord::Migration[4.2] + class InvitationCode < ApplicationRecord end - class User < ActiveRecord::Base + class User < ApplicationRecord end def change @@ -34,7 +34,7 @@ class CleanupInvitationColumnsFromUsers < ActiveRecord::Migration InvitationCode.where("count < 0").update_all(count: new_counter) # remove old invitation-users - User.delete_all(username: nil) + User.where(username: nil).delete_all change_column :users, :username, :string, null: false end @@ -47,7 +47,7 @@ class CleanupInvitationColumnsFromUsers < ActiveRecord::Migration end def create_invitations_table - # rubocop:disable Style/ExtraSpacing + # rubocop:disable Layout/ExtraSpacing create_table :invitations, force: :cascade do |t| t.text :message, limit: 65_535 t.integer :sender_id, limit: 4 @@ -60,7 +60,7 @@ class CleanupInvitationColumnsFromUsers < ActiveRecord::Migration t.boolean :admin, default: false t.string :language, limit: 255, default: "en" end - # rubocop:enable Style/ExtraSpacing + # rubocop:enable Layout/ExtraSpacing add_index :invitations, :aspect_id, name: :index_invitations_on_aspect_id, using: :btree add_index :invitations, :recipient_id, name: :index_invitations_on_recipient_id, using: :btree diff --git a/db/migrate/20160813115514_remove_id_tokens.rb b/db/migrate/20160813115514_remove_id_tokens.rb index 36689d688..346b2a24b 100644 --- a/db/migrate/20160813115514_remove_id_tokens.rb +++ b/db/migrate/20160813115514_remove_id_tokens.rb @@ -1,6 +1,6 @@ require_relative "20150714055110_create_id_tokens" -class RemoveIdTokens < ActiveRecord::Migration +class RemoveIdTokens < ActiveRecord::Migration[4.2] def change revert CreateIdTokens end diff --git a/db/migrate/20160822212739_remove_started_sharing_notifications_without_contact.rb b/db/migrate/20160822212739_remove_started_sharing_notifications_without_contact.rb index 70a62f68f..ddd1f5b3a 100644 --- a/db/migrate/20160822212739_remove_started_sharing_notifications_without_contact.rb +++ b/db/migrate/20160822212739_remove_started_sharing_notifications_without_contact.rb @@ -1,5 +1,5 @@ -class RemoveStartedSharingNotificationsWithoutContact < ActiveRecord::Migration - class Notification < ActiveRecord::Base +class RemoveStartedSharingNotificationsWithoutContact < ActiveRecord::Migration[4.2] + class Notification < ApplicationRecord end def up @@ -7,6 +7,7 @@ class RemoveStartedSharingNotificationsWithoutContact < ActiveRecord::Migration .joins("INNER JOIN people ON people.id = notifications.target_id") .joins("LEFT OUTER JOIN contacts ON contacts.person_id = people.id " \ "AND contacts.user_id = notifications.recipient_id") - .delete_all("contacts.id IS NULL") + .where("contacts.id IS NULL") + .delete_all end end diff --git a/db/migrate/20160829170244_add_post_default_to_aspects.rb b/db/migrate/20160829170244_add_post_default_to_aspects.rb index dcc2d76c6..e86193346 100644 --- a/db/migrate/20160829170244_add_post_default_to_aspects.rb +++ b/db/migrate/20160829170244_add_post_default_to_aspects.rb @@ -1,4 +1,4 @@ -class AddPostDefaultToAspects < ActiveRecord::Migration +class AddPostDefaultToAspects < ActiveRecord::Migration[4.2] def change add_column :aspects, :post_default, :boolean, default: true add_column :users, :post_default_public, :boolean, default: false diff --git a/db/migrate/20160901072443_add_video_url_to_open_graph_cache.rb b/db/migrate/20160901072443_add_video_url_to_open_graph_cache.rb index 487248a26..eb123a6b3 100644 --- a/db/migrate/20160901072443_add_video_url_to_open_graph_cache.rb +++ b/db/migrate/20160901072443_add_video_url_to_open_graph_cache.rb @@ -1,4 +1,4 @@ -class AddVideoUrlToOpenGraphCache < ActiveRecord::Migration +class AddVideoUrlToOpenGraphCache < ActiveRecord::Migration[4.2] def change add_column :open_graph_caches, :video_url, :text end diff --git a/db/migrate/20160902180630_remove_invalid_unconfirmed_emails.rb b/db/migrate/20160902180630_remove_invalid_unconfirmed_emails.rb index 086531c16..27a7feecf 100644 --- a/db/migrate/20160902180630_remove_invalid_unconfirmed_emails.rb +++ b/db/migrate/20160902180630_remove_invalid_unconfirmed_emails.rb @@ -1,5 +1,5 @@ -class RemoveInvalidUnconfirmedEmails < ActiveRecord::Migration - class User < ActiveRecord::Base +class RemoveInvalidUnconfirmedEmails < ActiveRecord::Migration[4.2] + class User < ApplicationRecord end def up diff --git a/db/migrate/20160906225138_fix_photos_share_visibilities.rb b/db/migrate/20160906225138_fix_photos_share_visibilities.rb index 3621fe28b..ff382a7d5 100644 --- a/db/migrate/20160906225138_fix_photos_share_visibilities.rb +++ b/db/migrate/20160906225138_fix_photos_share_visibilities.rb @@ -1,8 +1,8 @@ -class FixPhotosShareVisibilities < ActiveRecord::Migration - class Photo < ActiveRecord::Base +class FixPhotosShareVisibilities < ActiveRecord::Migration[4.2] + class Photo < ApplicationRecord end - class ShareVisibility < ActiveRecord::Base + class ShareVisibility < ApplicationRecord end def up diff --git a/db/migrate/20161015174300_remove_empty_pod.rb b/db/migrate/20161015174300_remove_empty_pod.rb index 482b4f5db..ba7369bc1 100644 --- a/db/migrate/20161015174300_remove_empty_pod.rb +++ b/db/migrate/20161015174300_remove_empty_pod.rb @@ -1,6 +1,6 @@ -class RemoveEmptyPod < ActiveRecord::Migration +class RemoveEmptyPod < ActiveRecord::Migration[4.2] def up - Pod.delete_all("host IS NULL") + Pod.where("host IS NULL").delete_all change_column :pods, :host, :string, null: false end diff --git a/db/migrate/20161024231443_add_scheduled_check_to_pod.rb b/db/migrate/20161024231443_add_scheduled_check_to_pod.rb index 6d18ba228..b080564b7 100644 --- a/db/migrate/20161024231443_add_scheduled_check_to_pod.rb +++ b/db/migrate/20161024231443_add_scheduled_check_to_pod.rb @@ -1,4 +1,4 @@ -class AddScheduledCheckToPod < ActiveRecord::Migration +class AddScheduledCheckToPod < ActiveRecord::Migration[4.2] def change add_column :pods, :scheduled_check, :boolean, default: false, null: false end diff --git a/db/migrate/20161107100840_polymorphic_mentions.rb b/db/migrate/20161107100840_polymorphic_mentions.rb new file mode 100644 index 000000000..99f65d822 --- /dev/null +++ b/db/migrate/20161107100840_polymorphic_mentions.rb @@ -0,0 +1,39 @@ +class PolymorphicMentions < ActiveRecord::Migration[4.2] + def change + remove_index :mentions, column: %i(post_id) + remove_index :mentions, column: %i(person_id post_id), unique: true + rename_column :mentions, :post_id, :mentions_container_id + add_column :mentions, :mentions_container_type, :string + add_index :mentions, + %i(mentions_container_id mentions_container_type), + name: "index_mentions_on_mc_id_and_mc_type", + length: {mentions_container_type: 191} + add_index :mentions, + %i(person_id mentions_container_id mentions_container_type), + name: "index_mentions_on_person_and_mc_id_and_mc_type", + length: {mentions_container_type: 191}, + unique: true + + reversible(&method(:up_down)) + end + + class Mention < ApplicationRecord + end + + class Notification < ApplicationRecord + end + + def up_down(change) + change.up do + Mention.update_all(mentions_container_type: "Post") + change_column :mentions, :mentions_container_type, :string, null: false + Notification.where(type: "Notifications::Mentioned").update_all(type: "Notifications::MentionedInPost") + end + + change.down do + Notification.where(type: "Notifications::MentionedInPost").update_all(type: "Notifications::Mentioned") + Mention.where(mentions_container_type: "Comment").destroy_all + Notification.where(type: "Notifications::MentionedInComment").destroy_all + end + end +end diff --git a/db/migrate/20170430022507_remove_message_signature.rb b/db/migrate/20170430022507_remove_message_signature.rb new file mode 100644 index 000000000..a8e65c2e0 --- /dev/null +++ b/db/migrate/20170430022507_remove_message_signature.rb @@ -0,0 +1,5 @@ +class RemoveMessageSignature < ActiveRecord::Migration[4.2] + def change + remove_column :messages, :author_signature, :text + end +end diff --git a/db/migrate/20170730154117_create_account_migrations.rb b/db/migrate/20170730154117_create_account_migrations.rb new file mode 100644 index 000000000..b01eadbc6 --- /dev/null +++ b/db/migrate/20170730154117_create_account_migrations.rb @@ -0,0 +1,14 @@ +class CreateAccountMigrations < ActiveRecord::Migration[5.1] + def change + create_table :account_migrations do |t| + t.integer :old_person_id, null: false + t.integer :new_person_id, null: false + end + + add_foreign_key :account_migrations, :people, column: :old_person_id + add_foreign_key :account_migrations, :people, column: :new_person_id + + add_index :account_migrations, %i[old_person_id new_person_id], unique: true + add_index :account_migrations, :old_person_id, unique: true + end +end diff --git a/db/migrate/20170813141631_cleanup_account_deletions_and_add_unique_index.rb b/db/migrate/20170813141631_cleanup_account_deletions_and_add_unique_index.rb new file mode 100644 index 000000000..6d188278d --- /dev/null +++ b/db/migrate/20170813141631_cleanup_account_deletions_and_add_unique_index.rb @@ -0,0 +1,19 @@ +class CleanupAccountDeletionsAndAddUniqueIndex < ActiveRecord::Migration[5.1] + def up + remove_column :account_deletions, :diaspora_handle + + duplicate_query = "WHERE a1.person_id = a2.person_id AND a1.id > a2.id" + if AppConfig.postgres? + execute("DELETE FROM account_deletions AS a1 USING account_deletions AS a2 #{duplicate_query}") + else + execute("DELETE a1 FROM account_deletions a1, account_deletions a2 #{duplicate_query}") + end + + add_index :account_deletions, :person_id, name: :index_account_deletions_on_person_id, unique: true + end + + def down + remove_index :account_deletions, name: :index_account_deletions_on_person_id + add_column :account_deletions, :diaspora_handle, :string + end +end diff --git a/db/migrate/20170813153048_add_missing_indexes.rb b/db/migrate/20170813153048_add_missing_indexes.rb new file mode 100644 index 000000000..9da177a30 --- /dev/null +++ b/db/migrate/20170813153048_add_missing_indexes.rb @@ -0,0 +1,7 @@ +class AddMissingIndexes < ActiveRecord::Migration[5.1] + def change + add_index :photos, :author_id + add_index :user_preferences, %i[user_id email_type], length: {email_type: 190} + add_index :locations, :status_message_id + end +end diff --git a/db/migrate/20170813160104_cleanup_aspects_and_add_unique_index.rb b/db/migrate/20170813160104_cleanup_aspects_and_add_unique_index.rb new file mode 100644 index 000000000..324f43a09 --- /dev/null +++ b/db/migrate/20170813160104_cleanup_aspects_and_add_unique_index.rb @@ -0,0 +1,21 @@ +class CleanupAspectsAndAddUniqueIndex < ActiveRecord::Migration[5.1] + class Aspect < ApplicationRecord + end + + def up + cleanup_aspects + add_index :aspects, %i[user_id name], name: :index_aspects_on_user_id_and_name, length: {name: 190}, unique: true + end + + def down + remove_index :aspects, name: :index_aspects_on_user_id_and_name + end + + def cleanup_aspects + Aspect.where(user_id: 0).delete_all + Aspect.joins("INNER JOIN aspects as a2 ON aspects.user_id = a2.user_id AND aspects.name = a2.name") + .where("aspects.id > a2.id").each do |aspect| + aspect.update_attributes(name: "#{aspect.name}_#{UUID.generate(:compact)}") + end + end +end diff --git a/db/migrate/20170813164435_add_missing_unique_indexes.rb b/db/migrate/20170813164435_add_missing_unique_indexes.rb new file mode 100644 index 000000000..4c853fbf1 --- /dev/null +++ b/db/migrate/20170813164435_add_missing_unique_indexes.rb @@ -0,0 +1,41 @@ +class AddMissingUniqueIndexes < ActiveRecord::Migration[5.1] + def up + cleanup + + remove_index :aspect_visibilities, name: :shareable_and_aspect_id + add_index :aspect_visibilities, %i[shareable_id shareable_type aspect_id], + name: :index_aspect_visibilities_on_shareable_and_aspect_id, + length: {shareable_type: 189}, unique: true + + add_index :blocks, %i[user_id person_id], name: :index_blocks_on_user_id_and_person_id, unique: true + + add_index :roles, %i[person_id name], name: :index_roles_on_person_id_and_name, length: {name: 190}, unique: true + end + + def down + remove_index :aspect_visibilities, name: :index_aspect_visibilities_on_shareable_and_aspect_id + add_index :aspect_visibilities, %i[shareable_id shareable_type aspect_id], name: :shareable_and_aspect_id, + length: {shareable_type: 189}, unique: true + + remove_index :blocks, name: :index_blocks_on_user_id_and_person_id + + remove_index :roles, name: :index_roles_on_person_id_and_name + end + + def cleanup + aspect_visibilities_where = "WHERE a1.shareable_id = a2.shareable_id AND a1.shareable_type = a2.shareable_type " \ + "AND a1.aspect_id = a2.aspect_id AND a1.id > a2.id" + blocks_where = "WHERE b1.user_id = b2.user_id AND b1.person_id = b2.person_id AND b1.id > b2.id" + roles_where = "WHERE r1.person_id = r2.person_id AND r1.name = r2.name AND r1.id > r2.id" + + if AppConfig.postgres? + execute "DELETE FROM aspect_visibilities AS a1 USING aspect_visibilities AS a2 #{aspect_visibilities_where}" + execute "DELETE FROM blocks AS b1 USING blocks AS b2 #{blocks_where}" + execute "DELETE FROM roles AS r1 USING roles AS r2 #{roles_where}" + else + execute "DELETE a1 FROM aspect_visibilities a1, aspect_visibilities a2 #{aspect_visibilities_where}" + execute "DELETE b1 FROM blocks b1, blocks b2 #{blocks_where}" + execute "DELETE r1 FROM roles r1, roles r2 #{roles_where}" + end + end +end diff --git a/db/migrate/20170813222333_reset_export_states.rb b/db/migrate/20170813222333_reset_export_states.rb new file mode 100644 index 000000000..12a7e5789 --- /dev/null +++ b/db/migrate/20170813222333_reset_export_states.rb @@ -0,0 +1,12 @@ +class ResetExportStates < ActiveRecord::Migration[5.1] + class User < ApplicationRecord + end + + def up + # rubocop:disable Rails/SkipsModelValidations + User.where(exporting: true).update_all(exporting: false, export: nil, exported_at: nil) + User.where(exporting_photos: true) + .update_all(exporting_photos: false, exported_photos_file: nil, exported_photos_at: nil) + # rubocop:enable Rails/SkipsModelValidations + end +end diff --git a/db/schema.rb b/db/schema.rb deleted file mode 100644 index 402f53db2..000000000 --- a/db/schema.rb +++ /dev/null @@ -1,675 +0,0 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 20161024231443) do - - create_table "account_deletions", force: :cascade do |t| - t.string "diaspora_handle", limit: 255 - t.integer "person_id", limit: 4 - t.datetime "completed_at" - end - - create_table "aspect_memberships", force: :cascade do |t| - t.integer "aspect_id", limit: 4, null: false - t.integer "contact_id", limit: 4, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "aspect_memberships", ["aspect_id", "contact_id"], name: "index_aspect_memberships_on_aspect_id_and_contact_id", unique: true, using: :btree - add_index "aspect_memberships", ["aspect_id"], name: "index_aspect_memberships_on_aspect_id", using: :btree - add_index "aspect_memberships", ["contact_id"], name: "index_aspect_memberships_on_contact_id", using: :btree - - create_table "aspect_visibilities", force: :cascade do |t| - t.integer "shareable_id", limit: 4, null: false - t.integer "aspect_id", limit: 4, null: false - t.string "shareable_type", limit: 255, default: "Post", null: false - end - - add_index "aspect_visibilities", ["aspect_id"], name: "index_aspect_visibilities_on_aspect_id", using: :btree - add_index "aspect_visibilities", ["shareable_id", "shareable_type", "aspect_id"], name: "shareable_and_aspect_id", length: {"shareable_id"=>nil, "shareable_type"=>189, "aspect_id"=>nil}, using: :btree - add_index "aspect_visibilities", ["shareable_id", "shareable_type"], name: "index_aspect_visibilities_on_shareable_id_and_shareable_type", length: {"shareable_id"=>nil, "shareable_type"=>190}, using: :btree - - create_table "aspects", force: :cascade do |t| - t.string "name", limit: 255, null: false - t.integer "user_id", limit: 4, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "contacts_visible", default: true, null: false - t.integer "order_id", limit: 4 - t.boolean "chat_enabled", default: false - t.boolean "post_default", default: true - end - - add_index "aspects", ["user_id", "contacts_visible"], name: "index_aspects_on_user_id_and_contacts_visible", using: :btree - add_index "aspects", ["user_id"], name: "index_aspects_on_user_id", using: :btree - - create_table "authorizations", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.integer "o_auth_application_id", limit: 4 - t.string "refresh_token", limit: 255 - t.string "code", limit: 255 - t.string "redirect_uri", limit: 255 - t.string "nonce", limit: 255 - t.string "scopes", limit: 255 - t.boolean "code_used", default: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "authorizations", ["o_auth_application_id"], name: "index_authorizations_on_o_auth_application_id", using: :btree - add_index "authorizations", ["user_id"], name: "index_authorizations_on_user_id", using: :btree - - create_table "blocks", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.integer "person_id", limit: 4 - end - - create_table "chat_contacts", force: :cascade do |t| - t.integer "user_id", limit: 4, null: false - t.string "jid", limit: 255, null: false - t.string "name", limit: 255 - t.string "ask", limit: 128 - t.string "subscription", limit: 128, null: false - end - - add_index "chat_contacts", ["user_id", "jid"], name: "index_chat_contacts_on_user_id_and_jid", unique: true, length: {"user_id"=>nil, "jid"=>190}, using: :btree - - create_table "chat_fragments", force: :cascade do |t| - t.integer "user_id", limit: 4, null: false - t.string "root", limit: 256, null: false - t.string "namespace", limit: 256, null: false - t.text "xml", limit: 65535, null: false - end - - add_index "chat_fragments", ["user_id"], name: "index_chat_fragments_on_user_id", unique: true, using: :btree - - create_table "chat_offline_messages", force: :cascade do |t| - t.string "from", limit: 255, null: false - t.string "to", limit: 255, null: false - t.text "message", limit: 65535, null: false - t.datetime "created_at", null: false - end - - create_table "comment_signatures", id: false, force: :cascade do |t| - t.integer "comment_id", limit: 4, null: false - t.text "author_signature", limit: 65535, null: false - t.integer "signature_order_id", limit: 4, null: false - t.text "additional_data", limit: 65535 - end - - add_index "comment_signatures", ["comment_id"], name: "index_comment_signatures_on_comment_id", unique: true, using: :btree - add_index "comment_signatures", ["signature_order_id"], name: "comment_signatures_signature_orders_id_fk", using: :btree - - create_table "comments", force: :cascade do |t| - t.text "text", limit: 65535, null: false - t.integer "commentable_id", limit: 4, null: false - t.integer "author_id", limit: 4, null: false - t.string "guid", limit: 255, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "likes_count", limit: 4, default: 0, null: false - t.string "commentable_type", limit: 60, default: "Post", null: false - end - - add_index "comments", ["author_id"], name: "index_comments_on_person_id", using: :btree - add_index "comments", ["commentable_id", "commentable_type"], name: "index_comments_on_commentable_id_and_commentable_type", using: :btree - add_index "comments", ["guid"], name: "index_comments_on_guid", unique: true, length: {"guid"=>191}, using: :btree - - create_table "contacts", force: :cascade do |t| - t.integer "user_id", limit: 4, null: false - t.integer "person_id", limit: 4, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "sharing", default: false, null: false - t.boolean "receiving", default: false, null: false - end - - add_index "contacts", ["person_id"], name: "index_contacts_on_person_id", using: :btree - add_index "contacts", ["user_id", "person_id"], name: "index_contacts_on_user_id_and_person_id", unique: true, using: :btree - - create_table "conversation_visibilities", force: :cascade do |t| - t.integer "conversation_id", limit: 4, null: false - t.integer "person_id", limit: 4, null: false - t.integer "unread", limit: 4, default: 0, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "conversation_visibilities", ["conversation_id", "person_id"], name: "index_conversation_visibilities_usefully", unique: true, using: :btree - add_index "conversation_visibilities", ["conversation_id"], name: "index_conversation_visibilities_on_conversation_id", using: :btree - add_index "conversation_visibilities", ["person_id"], name: "index_conversation_visibilities_on_person_id", using: :btree - - create_table "conversations", force: :cascade do |t| - t.string "subject", limit: 255 - t.string "guid", limit: 255, null: false - t.integer "author_id", limit: 4, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "conversations", ["author_id"], name: "conversations_author_id_fk", using: :btree - add_index "conversations", ["guid"], name: "index_conversations_on_guid", unique: true, length: {"guid"=>191}, using: :btree - - create_table "invitation_codes", force: :cascade do |t| - t.string "token", limit: 255 - t.integer "user_id", limit: 4 - t.integer "count", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "like_signatures", id: false, force: :cascade do |t| - t.integer "like_id", limit: 4, null: false - t.text "author_signature", limit: 65535, null: false - t.integer "signature_order_id", limit: 4, null: false - t.text "additional_data", limit: 65535 - end - - add_index "like_signatures", ["like_id"], name: "index_like_signatures_on_like_id", unique: true, using: :btree - add_index "like_signatures", ["signature_order_id"], name: "like_signatures_signature_orders_id_fk", using: :btree - - create_table "likes", force: :cascade do |t| - t.boolean "positive", default: true - t.integer "target_id", limit: 4 - t.integer "author_id", limit: 4 - t.string "guid", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "target_type", limit: 60, null: false - end - - add_index "likes", ["author_id"], name: "likes_author_id_fk", using: :btree - add_index "likes", ["guid"], name: "index_likes_on_guid", unique: true, length: {"guid"=>191}, using: :btree - add_index "likes", ["target_id", "author_id", "target_type"], name: "index_likes_on_target_id_and_author_id_and_target_type", unique: true, using: :btree - add_index "likes", ["target_id"], name: "index_likes_on_post_id", using: :btree - - create_table "locations", force: :cascade do |t| - t.string "address", limit: 255 - t.string "lat", limit: 255 - t.string "lng", limit: 255 - t.integer "status_message_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "mentions", force: :cascade do |t| - t.integer "post_id", limit: 4, null: false - t.integer "person_id", limit: 4, null: false - end - - add_index "mentions", ["person_id", "post_id"], name: "index_mentions_on_person_id_and_post_id", unique: true, using: :btree - add_index "mentions", ["person_id"], name: "index_mentions_on_person_id", using: :btree - add_index "mentions", ["post_id"], name: "index_mentions_on_post_id", using: :btree - - create_table "messages", force: :cascade do |t| - t.integer "conversation_id", limit: 4, null: false - t.integer "author_id", limit: 4, null: false - t.string "guid", limit: 255, null: false - t.text "text", limit: 65535, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.text "author_signature", limit: 65535 - end - - add_index "messages", ["author_id"], name: "index_messages_on_author_id", using: :btree - add_index "messages", ["conversation_id"], name: "messages_conversation_id_fk", using: :btree - add_index "messages", ["guid"], name: "index_messages_on_guid", unique: true, length: {"guid"=>191}, using: :btree - - create_table "notification_actors", force: :cascade do |t| - t.integer "notification_id", limit: 4 - t.integer "person_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "notification_actors", ["notification_id", "person_id"], name: "index_notification_actors_on_notification_id_and_person_id", unique: true, using: :btree - add_index "notification_actors", ["notification_id"], name: "index_notification_actors_on_notification_id", using: :btree - add_index "notification_actors", ["person_id"], name: "index_notification_actors_on_person_id", using: :btree - - create_table "notifications", force: :cascade do |t| - t.string "target_type", limit: 255 - t.integer "target_id", limit: 4 - t.integer "recipient_id", limit: 4, null: false - t.boolean "unread", default: true, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "type", limit: 255 - end - - add_index "notifications", ["recipient_id"], name: "index_notifications_on_recipient_id", using: :btree - add_index "notifications", ["target_id"], name: "index_notifications_on_target_id", using: :btree - add_index "notifications", ["target_type", "target_id"], name: "index_notifications_on_target_type_and_target_id", length: {"target_type"=>190, "target_id"=>nil}, using: :btree - - create_table "o_auth_access_tokens", force: :cascade do |t| - t.integer "authorization_id", limit: 4 - t.string "token", limit: 255 - t.datetime "expires_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "o_auth_access_tokens", ["authorization_id"], name: "index_o_auth_access_tokens_on_authorization_id", using: :btree - add_index "o_auth_access_tokens", ["token"], name: "index_o_auth_access_tokens_on_token", unique: true, length: {"token"=>191}, using: :btree - - create_table "o_auth_applications", force: :cascade do |t| - t.integer "user_id", limit: 4 - t.string "client_id", limit: 255 - t.string "client_secret", limit: 255 - t.string "client_name", limit: 255 - t.text "redirect_uris", limit: 65535 - t.string "response_types", limit: 255 - t.string "grant_types", limit: 255 - t.string "application_type", limit: 255, default: "web" - t.string "contacts", limit: 255 - t.string "logo_uri", limit: 255 - t.string "client_uri", limit: 255 - t.string "policy_uri", limit: 255 - t.string "tos_uri", limit: 255 - t.string "sector_identifier_uri", limit: 255 - t.string "token_endpoint_auth_method", limit: 255 - t.text "jwks", limit: 65535 - t.string "jwks_uri", limit: 255 - t.boolean "ppid", default: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "o_auth_applications", ["client_id"], name: "index_o_auth_applications_on_client_id", unique: true, length: {"client_id"=>191}, using: :btree - add_index "o_auth_applications", ["user_id"], name: "index_o_auth_applications_on_user_id", using: :btree - - create_table "o_embed_caches", force: :cascade do |t| - t.string "url", limit: 1024, null: false - t.text "data", limit: 65535, null: false - end - - add_index "o_embed_caches", ["url"], name: "index_o_embed_caches_on_url", length: {"url"=>191}, using: :btree - - create_table "open_graph_caches", force: :cascade do |t| - t.string "title", limit: 255 - t.string "ob_type", limit: 255 - t.text "image", limit: 65535 - t.text "url", limit: 65535 - t.text "description", limit: 65535 - t.text "video_url", limit: 65535 - end - - create_table "participations", force: :cascade do |t| - t.string "guid", limit: 255 - t.integer "target_id", limit: 4 - t.string "target_type", limit: 60, null: false - t.integer "author_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "count", limit: 4, default: 1, null: false - end - - add_index "participations", ["author_id"], name: "index_participations_on_author_id", using: :btree - add_index "participations", ["guid"], name: "index_participations_on_guid", length: {"guid"=>191}, using: :btree - add_index "participations", ["target_id", "target_type", "author_id"], name: "index_participations_on_target_id_and_target_type_and_author_id", unique: true, using: :btree - - create_table "people", force: :cascade do |t| - t.string "guid", limit: 255, null: false - t.string "diaspora_handle", limit: 255, null: false - t.text "serialized_public_key", limit: 65535, null: false - t.integer "owner_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "closed_account", default: false - t.integer "fetch_status", limit: 4, default: 0 - t.integer "pod_id", limit: 4 - end - - add_index "people", ["diaspora_handle"], name: "index_people_on_diaspora_handle", unique: true, length: {"diaspora_handle"=>191}, using: :btree - add_index "people", ["guid"], name: "index_people_on_guid", unique: true, length: {"guid"=>191}, using: :btree - add_index "people", ["owner_id"], name: "index_people_on_owner_id", unique: true, using: :btree - add_index "people", ["pod_id"], name: "people_pod_id_fk", using: :btree - - create_table "photos", force: :cascade do |t| - t.integer "author_id", limit: 4, null: false - t.boolean "public", default: false, null: false - t.string "guid", limit: 255, null: false - t.boolean "pending", default: false, null: false - t.text "text", limit: 65535 - t.text "remote_photo_path", limit: 65535 - t.string "remote_photo_name", limit: 255 - t.string "random_string", limit: 255 - t.string "processed_image", limit: 255 - t.datetime "created_at" - t.datetime "updated_at" - t.string "unprocessed_image", limit: 255 - t.string "status_message_guid", limit: 255 - t.integer "comments_count", limit: 4 - t.integer "height", limit: 4 - t.integer "width", limit: 4 - end - - add_index "photos", ["guid"], name: "index_photos_on_guid", unique: true, length: {"guid"=>191}, using: :btree - add_index "photos", ["status_message_guid"], name: "index_photos_on_status_message_guid", length: {"status_message_guid"=>191}, using: :btree - - create_table "pods", force: :cascade do |t| - t.string "host", limit: 255, null: false - t.boolean "ssl" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "status", limit: 4, default: 0 - t.datetime "checked_at", default: '1970-01-01 00:00:00' - t.datetime "offline_since" - t.integer "response_time", limit: 4, default: -1 - t.string "software", limit: 255 - t.string "error", limit: 255 - t.integer "port", limit: 4 - t.boolean "blocked", default: false - t.boolean "scheduled_check", default: false, null: false - end - - add_index "pods", ["checked_at"], name: "index_pods_on_checked_at", using: :btree - add_index "pods", ["host", "port"], name: "index_pods_on_host_and_port", unique: true, length: {"host"=>190, "port"=>nil}, using: :btree - add_index "pods", ["offline_since"], name: "index_pods_on_offline_since", using: :btree - add_index "pods", ["status"], name: "index_pods_on_status", using: :btree - - create_table "poll_answers", force: :cascade do |t| - t.string "answer", limit: 255, null: false - t.integer "poll_id", limit: 4, null: false - t.string "guid", limit: 255 - t.integer "vote_count", limit: 4, default: 0 - end - - add_index "poll_answers", ["guid"], name: "index_poll_answers_on_guid", unique: true, length: {"guid"=>191}, using: :btree - add_index "poll_answers", ["poll_id"], name: "index_poll_answers_on_poll_id", using: :btree - - create_table "poll_participation_signatures", id: false, force: :cascade do |t| - t.integer "poll_participation_id", limit: 4, null: false - t.text "author_signature", limit: 65535, null: false - t.integer "signature_order_id", limit: 4, null: false - t.text "additional_data", limit: 65535 - end - - add_index "poll_participation_signatures", ["poll_participation_id"], name: "index_poll_participation_signatures_on_poll_participation_id", unique: true, using: :btree - add_index "poll_participation_signatures", ["signature_order_id"], name: "poll_participation_signatures_signature_orders_id_fk", using: :btree - - create_table "poll_participations", force: :cascade do |t| - t.integer "poll_answer_id", limit: 4, null: false - t.integer "author_id", limit: 4, null: false - t.integer "poll_id", limit: 4, null: false - t.string "guid", limit: 255 - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "poll_participations", ["guid"], name: "index_poll_participations_on_guid", unique: true, length: {"guid"=>191}, using: :btree - add_index "poll_participations", ["poll_id"], name: "index_poll_participations_on_poll_id", using: :btree - - create_table "polls", force: :cascade do |t| - t.string "question", limit: 255, null: false - t.integer "status_message_id", limit: 4, null: false - t.boolean "status" - t.string "guid", limit: 255 - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "polls", ["guid"], name: "index_polls_on_guid", unique: true, length: {"guid"=>191}, using: :btree - add_index "polls", ["status_message_id"], name: "index_polls_on_status_message_id", using: :btree - - create_table "posts", force: :cascade do |t| - t.integer "author_id", limit: 4, null: false - t.boolean "public", default: false, null: false - t.string "guid", limit: 255, null: false - t.string "type", limit: 40, null: false - t.text "text", limit: 65535 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "provider_display_name", limit: 255 - t.string "root_guid", limit: 255 - t.integer "likes_count", limit: 4, default: 0 - t.integer "comments_count", limit: 4, default: 0 - t.integer "o_embed_cache_id", limit: 4 - t.integer "reshares_count", limit: 4, default: 0 - t.datetime "interacted_at" - t.string "facebook_id", limit: 255 - t.string "tweet_id", limit: 255 - t.integer "open_graph_cache_id", limit: 4 - t.text "tumblr_ids", limit: 65535 - end - - add_index "posts", ["author_id", "root_guid"], name: "index_posts_on_author_id_and_root_guid", unique: true, length: {"author_id"=>nil, "root_guid"=>190}, using: :btree - add_index "posts", ["author_id"], name: "index_posts_on_person_id", using: :btree - add_index "posts", ["guid"], name: "index_posts_on_guid", unique: true, length: {"guid"=>191}, using: :btree - add_index "posts", ["id", "type", "created_at"], name: "index_posts_on_id_and_type_and_created_at", using: :btree - add_index "posts", ["id", "type"], name: "index_posts_on_id_and_type", using: :btree - add_index "posts", ["root_guid"], name: "index_posts_on_root_guid", length: {"root_guid"=>191}, using: :btree - add_index "posts", ["tweet_id"], name: "index_posts_on_tweet_id", length: {"tweet_id"=>191}, using: :btree - - create_table "ppid", force: :cascade do |t| - t.integer "o_auth_application_id", limit: 4 - t.integer "user_id", limit: 4 - t.string "guid", limit: 32 - t.string "string", limit: 32 - t.string "identifier", limit: 255 - end - - add_index "ppid", ["o_auth_application_id"], name: "index_ppid_on_o_auth_application_id", using: :btree - add_index "ppid", ["user_id"], name: "index_ppid_on_user_id", using: :btree - - create_table "profiles", force: :cascade do |t| - t.string "diaspora_handle", limit: 255 - t.string "first_name", limit: 127 - t.string "last_name", limit: 127 - t.string "image_url", limit: 255 - t.string "image_url_small", limit: 255 - t.string "image_url_medium", limit: 255 - t.date "birthday" - t.string "gender", limit: 255 - t.text "bio", limit: 65535 - t.boolean "searchable", default: true, null: false - t.integer "person_id", limit: 4, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "location", limit: 255 - t.string "full_name", limit: 70 - t.boolean "nsfw", default: false - t.boolean "public_details", default: false - end - - add_index "profiles", ["full_name", "searchable"], name: "index_profiles_on_full_name_and_searchable", using: :btree - add_index "profiles", ["full_name"], name: "index_profiles_on_full_name", using: :btree - add_index "profiles", ["person_id"], name: "index_profiles_on_person_id", using: :btree - - create_table "rails_admin_histories", force: :cascade do |t| - t.text "message", limit: 65535 - t.string "username", limit: 255 - t.integer "item", limit: 4 - t.string "table", limit: 255 - t.integer "month", limit: 2 - t.integer "year", limit: 8 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "rails_admin_histories", ["item", "table", "month", "year"], name: "index_rails_admin_histories", length: {"item"=>nil, "table"=>188, "month"=>nil, "year"=>nil}, using: :btree - - create_table "reports", force: :cascade do |t| - t.integer "item_id", limit: 4, null: false - t.string "item_type", limit: 255, null: false - t.boolean "reviewed", default: false - t.text "text", limit: 65535 - t.datetime "created_at" - t.datetime "updated_at" - t.integer "user_id", limit: 4, null: false - end - - add_index "reports", ["item_id"], name: "index_reports_on_item_id", using: :btree - - create_table "roles", force: :cascade do |t| - t.integer "person_id", limit: 4 - t.string "name", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "services", force: :cascade do |t| - t.string "type", limit: 127, null: false - t.integer "user_id", limit: 4, null: false - t.string "uid", limit: 127 - t.string "access_token", limit: 255 - t.string "access_secret", limit: 255 - t.string "nickname", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "services", ["type", "uid"], name: "index_services_on_type_and_uid", length: {"type"=>64, "uid"=>nil}, using: :btree - add_index "services", ["user_id"], name: "index_services_on_user_id", using: :btree - - create_table "share_visibilities", force: :cascade do |t| - t.integer "shareable_id", limit: 4, null: false - t.boolean "hidden", default: false, null: false - t.string "shareable_type", limit: 60, default: "Post", null: false - t.integer "user_id", limit: 4, null: false - end - - add_index "share_visibilities", ["shareable_id", "shareable_type", "hidden", "user_id"], name: "shareable_and_hidden_and_user_id", using: :btree - add_index "share_visibilities", ["shareable_id", "shareable_type", "user_id"], name: "shareable_and_user_id", unique: true, using: :btree - add_index "share_visibilities", ["shareable_id"], name: "index_post_visibilities_on_post_id", using: :btree - add_index "share_visibilities", ["user_id"], name: "index_share_visibilities_on_user_id", using: :btree - - create_table "signature_orders", force: :cascade do |t| - t.string "order", limit: 255, null: false - end - - add_index "signature_orders", ["order"], name: "index_signature_orders_on_order", unique: true, length: {"order"=>191}, using: :btree - - create_table "simple_captcha_data", force: :cascade do |t| - t.string "key", limit: 40 - t.string "value", limit: 12 - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "simple_captcha_data", ["key"], name: "idx_key", using: :btree - - create_table "tag_followings", force: :cascade do |t| - t.integer "tag_id", limit: 4, null: false - t.integer "user_id", limit: 4, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "tag_followings", ["tag_id", "user_id"], name: "index_tag_followings_on_tag_id_and_user_id", unique: true, using: :btree - add_index "tag_followings", ["tag_id"], name: "index_tag_followings_on_tag_id", using: :btree - add_index "tag_followings", ["user_id"], name: "index_tag_followings_on_user_id", using: :btree - - create_table "taggings", force: :cascade do |t| - t.integer "tag_id", limit: 4 - t.integer "taggable_id", limit: 4 - t.string "taggable_type", limit: 127 - t.integer "tagger_id", limit: 4 - t.string "tagger_type", limit: 127 - t.string "context", limit: 127 - t.datetime "created_at" - end - - add_index "taggings", ["created_at"], name: "index_taggings_on_created_at", using: :btree - add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree - add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", length: {"taggable_id"=>nil, "taggable_type"=>95, "context"=>95}, using: :btree - add_index "taggings", ["taggable_id", "taggable_type", "tag_id"], name: "index_taggings_uniquely", unique: true, using: :btree - - create_table "tags", force: :cascade do |t| - t.string "name", limit: 255 - t.integer "taggings_count", limit: 4, default: 0 - end - - add_index "tags", ["name"], name: "index_tags_on_name", unique: true, length: {"name"=>191}, using: :btree - - create_table "user_preferences", force: :cascade do |t| - t.string "email_type", limit: 255 - t.integer "user_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - create_table "users", force: :cascade do |t| - t.string "username", limit: 255, null: false - t.text "serialized_private_key", limit: 65535 - t.boolean "getting_started", default: true, null: false - t.boolean "disable_mail", default: false, null: false - t.string "language", limit: 255 - t.string "email", limit: 255, default: "", null: false - t.string "encrypted_password", limit: 255, default: "", null: false - t.string "reset_password_token", limit: 255 - t.datetime "remember_created_at" - t.integer "sign_in_count", limit: 4, default: 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip", limit: 255 - t.string "last_sign_in_ip", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "invited_by_id", limit: 4 - t.string "authentication_token", limit: 30 - t.string "unconfirmed_email", limit: 255 - t.string "confirm_email_token", limit: 30 - t.datetime "locked_at" - t.boolean "show_community_spotlight_in_stream", default: true, null: false - t.boolean "auto_follow_back", default: false - t.integer "auto_follow_back_aspect_id", limit: 4 - t.text "hidden_shareables", limit: 65535 - t.datetime "reset_password_sent_at" - t.datetime "last_seen" - t.datetime "remove_after" - t.string "export", limit: 255 - t.datetime "exported_at" - t.boolean "exporting", default: false - t.boolean "strip_exif", default: true - t.string "exported_photos_file", limit: 255 - t.datetime "exported_photos_at" - t.boolean "exporting_photos", default: false - t.string "color_theme", limit: 255 - t.boolean "post_default_public", default: false - end - - add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true, using: :btree - add_index "users", ["email"], name: "index_users_on_email", unique: true, length: {"email"=>191}, using: :btree - add_index "users", ["username"], name: "index_users_on_username", unique: true, length: {"username"=>191}, using: :btree - - add_foreign_key "aspect_memberships", "aspects", name: "aspect_memberships_aspect_id_fk", on_delete: :cascade - add_foreign_key "aspect_memberships", "contacts", name: "aspect_memberships_contact_id_fk", on_delete: :cascade - add_foreign_key "aspect_visibilities", "aspects", name: "aspect_visibilities_aspect_id_fk", on_delete: :cascade - add_foreign_key "authorizations", "o_auth_applications" - add_foreign_key "authorizations", "users" - add_foreign_key "comment_signatures", "comments", name: "comment_signatures_comment_id_fk", on_delete: :cascade - add_foreign_key "comment_signatures", "signature_orders", name: "comment_signatures_signature_orders_id_fk" - add_foreign_key "comments", "people", column: "author_id", name: "comments_author_id_fk", on_delete: :cascade - add_foreign_key "contacts", "people", name: "contacts_person_id_fk", on_delete: :cascade - add_foreign_key "conversation_visibilities", "conversations", name: "conversation_visibilities_conversation_id_fk", on_delete: :cascade - add_foreign_key "conversation_visibilities", "people", name: "conversation_visibilities_person_id_fk", on_delete: :cascade - add_foreign_key "conversations", "people", column: "author_id", name: "conversations_author_id_fk", on_delete: :cascade - add_foreign_key "like_signatures", "likes", name: "like_signatures_like_id_fk", on_delete: :cascade - add_foreign_key "like_signatures", "signature_orders", name: "like_signatures_signature_orders_id_fk" - add_foreign_key "likes", "people", column: "author_id", name: "likes_author_id_fk", on_delete: :cascade - add_foreign_key "messages", "conversations", name: "messages_conversation_id_fk", on_delete: :cascade - add_foreign_key "messages", "people", column: "author_id", name: "messages_author_id_fk", on_delete: :cascade - add_foreign_key "notification_actors", "notifications", name: "notification_actors_notification_id_fk", on_delete: :cascade - add_foreign_key "o_auth_access_tokens", "authorizations" - add_foreign_key "o_auth_applications", "users" - add_foreign_key "people", "pods", name: "people_pod_id_fk", on_delete: :cascade - add_foreign_key "poll_participation_signatures", "poll_participations", name: "poll_participation_signatures_poll_participation_id_fk", on_delete: :cascade - add_foreign_key "poll_participation_signatures", "signature_orders", name: "poll_participation_signatures_signature_orders_id_fk" - add_foreign_key "posts", "people", column: "author_id", name: "posts_author_id_fk", on_delete: :cascade - add_foreign_key "ppid", "o_auth_applications" - add_foreign_key "ppid", "users" - add_foreign_key "profiles", "people", name: "profiles_person_id_fk", on_delete: :cascade - add_foreign_key "services", "users", name: "services_user_id_fk", on_delete: :cascade - add_foreign_key "share_visibilities", "users", name: "share_visibilities_user_id_fk", on_delete: :cascade -end diff --git a/features/desktop/change_settings.feature b/features/desktop/change_settings.feature index ba0543908..6bc8ae641 100644 --- a/features/desktop/change_settings.feature +++ b/features/desktop/change_settings.feature @@ -22,6 +22,10 @@ Feature: Change settings And I press "change_email_preferences" Then I should see "Email notifications changed" And the "user_email_preferences_mentioned" checkbox should not be checked + When I uncheck "user_email_preferences_mentioned_in_comment" + And I press "change_email_preferences" + Then I should see "Email notifications changed" + And the "user_email_preferences_mentioned_in_comment" checkbox should not be checked Scenario: Change my preferred language When I select "polski" from "user_language" @@ -49,3 +53,8 @@ Feature: Change settings And I go to the stream page And I expand the publisher Then I should see "Public" within ".aspect_dropdown" + + Scenario: exporting profile data + When I click on the first selector "#account_data a" + Then I should see "Download my profile" + And I should have 1 email delivery diff --git a/features/desktop/connects_users.feature b/features/desktop/connects_users.feature index 60a514e4a..b9f934735 100644 --- a/features/desktop/connects_users.feature +++ b/features/desktop/connects_users.feature @@ -35,8 +35,8 @@ Feature: following and being followed And I fill in "aspect_name" with "Super People" in the aspect creation modal And I click on selector ".btn-primary" in the aspect creation modal + And I wait until ajax requests finished - When I go to the home page Then I should have 1 contact in "Super People" Then I sign out diff --git a/features/desktop/follows_tags.feature b/features/desktop/follows_tags.feature index 78692e71c..fcdfbf3a5 100644 --- a/features/desktop/follows_tags.feature +++ b/features/desktop/follows_tags.feature @@ -16,7 +16,7 @@ Feature: posting Then I should see a ".tag-following-action .followed" Scenario: can post a message from the tag page - Then I should see "#boss" within "#publisher" + Then I should see "#boss " in the publisher When I click the publisher and post "#boss from the tag page" And I go to the tag page for "boss" Then I should see "#boss from the tag page" diff --git a/features/desktop/invitations.feature b/features/desktop/invitations.feature index dd38873cc..f01e194e3 100644 --- a/features/desktop/invitations.feature +++ b/features/desktop/invitations.feature @@ -52,13 +52,15 @@ Feature: Invitations Scenario: sends an invitation from the stream When I sign in as "alice@alice.alice" - And I press the first "a.invitations-link" within "#no_contacts" + Then I should see "There are no posts to display here yet." within ".no-posts-info" + When I press the first "a.invitations-link" within "#no_contacts" Then I should see "Invite someone to join diaspora*!" within "#invitationsModalLabel" And I fill in the following: | email_inviter_emails | alex@example.com | And I press "Send an invitation" Then I should see a flash message indicating success And I should have 1 Devise email delivery + And I should see "You have been invited to join diaspora* by Alice Smith" in the last sent email And I should not see "change your notification settings" in the last sent email Scenario: sends an invitation from the people search page diff --git a/features/desktop/mentions.feature b/features/desktop/mentions.feature index 01791180f..d68358b58 100644 --- a/features/desktop/mentions.feature +++ b/features/desktop/mentions.feature @@ -54,3 +54,34 @@ Feature: Mentions Then I should see "Bob Jones" within ".stream-element" When I follow "Bob Jones" Then I should see "Bob Jones" + + Scenario: A user mentions another user in a comment and it displays correctly + Given following users exist: + | username | email | + | Bob Jones | bob@bob.bob | + | Alice Smith | alice@alice.alice | + And a user with email "bob@bob.bob" is connected with "alice@alice.alice" + And "alice@alice.alice" has a public post with text "check this out!" + And "alice@alice.alice" has commented mentioning "bob@bob.bob" on "check this out!" + When I sign in as "alice@alice.alice" + And I follow "Bob Jones" + Then I should see "Bob Jones" + + Scenario: A user mentions another user in a comment using mention suggestions + Given following users exist: + | username | email | + | Bob Jones | bob@bob.bob | + | Alice Smith | alice@alice.alice | + And a user with email "bob@bob.bob" is connected with "alice@alice.alice" + And "alice@alice.alice" has a public post with text "check this out!" + When I sign in as "alice@alice.alice" + Then I should see "check this out!" + When I focus the comment field + And I enter "@Bob" in the comment field + Then I should see "Bob Jones" within ".tt-suggestion" + When I click on the first user in the mentions dropdown list + And I press the "A" key in the publisher + And I append "@Bob" to the publisher + Then I should not see the mentions dropdown list + When I press "Comment" + Then I should see "Bob Jones" within ".comments .comment:last-child" diff --git a/features/desktop/notifications.feature b/features/desktop/notifications.feature index 2dd5eaee4..7726d3d87 100644 --- a/features/desktop/notifications.feature +++ b/features/desktop/notifications.feature @@ -101,6 +101,26 @@ Feature: Notifications Then I should see "mentioned you in the post" And I should have 1 email delivery + Scenario: someone mentioned me in a comment + Given "alice@alice.alice" has a public post with text "check this out!" + And "bob@bob.bob" has commented mentioning "alice@alice.alice" on "check this out!" + When I sign in as "alice@alice.alice" + And I follow "Notifications" in the header + Then the notification dropdown should be visible + And I should see "mentioned you in a comment" + And I should have 1 email delivery + + Scenario: I mark a notification as read + Given a user with email "bob@bob.bob" is connected with "alice@alice.alice" + And Alice has a post mentioning Bob + When I sign in as "bob@bob.bob" + And I follow "Notifications" in the header + Then the notification dropdown should be visible + And I wait for notifications to load + And I should see a ".unread .unread-toggle .entypo-eye" + When I click on selector ".unread .unread-toggle .entypo-eye" + Then I should see a ".read .unread-toggle" + Scenario: filter notifications Given a user with email "bob@bob.bob" is connected with "alice@alice.alice" And Alice has a post mentioning Bob @@ -157,6 +177,5 @@ Feature: Notifications When I wait for notifications to load Then there should be 10 notifications loaded When I scroll down on the notifications dropdown - Then the notification dropdown should load more notifications When I wait for notifications to load Then there should be 15 notifications loaded diff --git a/features/desktop/post_preview.feature b/features/desktop/post_preview.feature index 827b36d36..d2a69b687 100644 --- a/features/desktop/post_preview.feature +++ b/features/desktop/post_preview.feature @@ -44,7 +44,7 @@ Feature: preview posts in the stream Given I expand the publisher And I attach "spec/fixtures/button.png" to the publisher When I fill in the following: - | status_message_fake_text | Look at this dog | + | status_message_text | Look at this dog | And I preview the post Then I should see a "img" within ".md-preview .stream-element .photo_attachments" And I should see "Look at this dog" within ".md-preview .stream-element" @@ -63,7 +63,7 @@ Feature: preview posts in the stream Then I should see "Samuel Beckett" When I expand the publisher And I fill in the following: - | status_message_fake_text | This preview rocks | + | status_message_text | This preview rocks | And I preview the post Then I should see "This preview rocks" in the preview And I close the publisher @@ -71,11 +71,11 @@ Feature: preview posts in the stream Scenario: preview a post with the poll Given I expand the publisher When I fill in the following: - | status_message_fake_text | I am eating yogurt | + | status_message_text | I am eating yogurt | And I click on selector "#poll_creator" When I fill in the following: - | status_message_fake_text | I am eating yogurt | - | poll_question | What kind of yogurt do you like? | + | status_message_text | I am eating yogurt | + | poll_question | What kind of yogurt do you like? | And I fill in the following for the options: | normal | | not normal | @@ -87,12 +87,12 @@ Feature: preview posts in the stream Scenario: preview a post with location Given I expand the publisher When I fill in the following: - | status_message_fake_text | I am eating yogurt | + | status_message_text | I am eating yogurt | And I allow geolocation And I click on selector "#locator" When I fill in the following: - | status_message_fake_text | I am eating yogurt | - | location_address | Some cool place | + | status_message_text | I am eating yogurt | + | location_address | Some cool place | And I preview the post Then I should see a ".near-from" within ".md-preview .stream-element" And I should see "Some cool place" within ".md-preview .stream-element .near-from" diff --git a/features/desktop/post_with_a_poll.feature b/features/desktop/post_with_a_poll.feature index b5b3a0ff8..5a27fc7ee 100644 --- a/features/desktop/post_with_a_poll.feature +++ b/features/desktop/post_with_a_poll.feature @@ -40,8 +40,8 @@ Feature: posting with a poll Given I expand the publisher And I click on selector "#poll_creator" When I fill in the following: - | status_message_fake_text | I am eating yogurt | - | poll_question | What kind of yogurt do you like? | + | status_message_text | I am eating yogurt | + | poll_question | What kind of yogurt do you like? | And I fill in the following for the options: | normal | | not normal | @@ -53,8 +53,8 @@ Feature: posting with a poll Given I expand the publisher And I click on selector "#poll_creator" When I fill in the following: - | status_message_fake_text | I am eating yogurt | - | poll_question | What kind of yogurt do you like? | + | status_message_text | I am eating yogurt | + | poll_question | What kind of yogurt do you like? | And I fill in the following for the options: | normal | | not normal | @@ -70,8 +70,8 @@ Feature: posting with a poll Given I expand the publisher And I click on selector "#poll_creator" When I fill in the following: - | status_message_fake_text | I am eating yogurt | - | poll_question | What kind of yogurt do you like? | + | status_message_text | I am eating yogurt | + | poll_question | What kind of yogurt do you like? | And I fill in the following for the options: | normal | | not normal | @@ -83,8 +83,8 @@ Feature: posting with a poll Given I expand the publisher And I click on selector "#poll_creator" When I fill in the following: - | status_message_fake_text | I am eating yogurt | - | poll_question | What kind of yogurt do you like? | + | status_message_text | I am eating yogurt | + | poll_question | What kind of yogurt do you like? | And I fill in the following for the options: | normal | | | diff --git a/features/desktop/signs_up.feature b/features/desktop/signs_up.feature index d68c58f19..bed865064 100644 --- a/features/desktop/signs_up.feature +++ b/features/desktop/signs_up.feature @@ -58,6 +58,7 @@ Feature: new user registration | profile_first_name | some name | And I fill in "tags" with "#rockstar" And I press the first ".as-result-item" within "#as-results-tags" + And I wait until ajax requests finished And I follow "awesome_button" Then I should be on the stream page And the publisher should be expanded diff --git a/features/mobile/activity_stream.feature b/features/mobile/activity_stream.feature index 27475abcd..823b4f7ad 100644 --- a/features/mobile/activity_stream.feature +++ b/features/mobile/activity_stream.feature @@ -21,7 +21,8 @@ Feature: Viewing my activity on the stream mobile page Scenario: Show liked post on my activity When I sign in as "bob@bob.bob" on the mobile website When I click on selector "a.like-action.inactive" - And I go to the activity stream page + Then I should see an element "a.like-action.active" + When I go to the activity stream page Then I should see "My activity" within "#main" And I should see "Hello! I am #newhere" within ".ltr" diff --git a/features/mobile/drawer.feature b/features/mobile/drawer.feature index 42f934581..700fc95b8 100644 --- a/features/mobile/drawer.feature +++ b/features/mobile/drawer.feature @@ -9,7 +9,7 @@ Feature: Navigate between pages using the header menu and the drawer Scenario: navigate to the stream page When I go to the activity stream page - And I click on selector "#header-title" + And I click on selector ".header-title" Then I should be on the stream page Scenario: navigate to the notification page diff --git a/features/mobile/posts_from_main_page.feature b/features/mobile/posts_from_main_page.feature index 22fb6195a..9afee520d 100644 --- a/features/mobile/posts_from_main_page.feature +++ b/features/mobile/posts_from_main_page.feature @@ -20,7 +20,7 @@ Feature: posting from the mobile main page Scenario: post and delete some text Given I visit the mobile publisher page - And I append "I am eating yogurt" to the mobile publisher + And I append "I am eating yogurt" to the publisher And I select "Unicorns" from "aspect_ids_" And I press "Share" When I go to the stream page @@ -52,7 +52,7 @@ Feature: posting from the mobile main page Scenario: back out of uploading a picture when another has been attached Given I visit the mobile publisher page - And I append "I am eating yogurt" to the mobile publisher + And I append "I am eating yogurt" to the publisher And I attach the file "spec/fixtures/button.gif" to hidden "qqfile" within "#file-upload-publisher" And I attach the file "spec/fixtures/button.png" to hidden "qqfile" within "#file-upload-publisher" And I click to delete the first uploaded photo diff --git a/features/step_definitions/aspects_steps.rb b/features/step_definitions/aspects_steps.rb index 8881cd946..39726a308 100644 --- a/features/step_definitions/aspects_steps.rb +++ b/features/step_definitions/aspects_steps.rb @@ -46,8 +46,13 @@ end When /^I select only "([^"]*)" aspect$/ do |aspect_name| click_link "My aspects" + expect(find("#aspect_stream_container")).to have_css(".loader.hidden", visible: false) within("#aspects_list") do - all(".selected").each {|node| node.find(:xpath, "..").click } + all(".selected").each do |node| + aspect_item = node.find(:xpath, "..") + aspect_item.click + expect(aspect_item).to have_no_css ".selected" + end expect(current_scope).to have_no_css ".selected" end step %Q(I select "#{aspect_name}" aspect as well) diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb index 0d669f1ac..0679e7b3d 100644 --- a/features/step_definitions/comment_steps.rb +++ b/features/step_definitions/comment_steps.rb @@ -3,12 +3,12 @@ When /^I focus the comment field$/ do end Then /^the first comment field should be open/ do - find("#main_stream .stream-element .new_comment").should be_visible + find("#main_stream .stream-element .new-comment").should be_visible end Then /^the first comment field should be closed$/ do page.should have_css(".stream-element .media") - page.should_not have_selector("#main_stream .stream-element .new_comment", match: :first) + page.should_not have_selector("#main_stream .stream-element .new-comment", match: :first) end When /^I make a show page comment "([^"]*)"$/ do |comment_text| @@ -21,6 +21,12 @@ Given /^"([^"]*)" has commented "([^"]*)" on "([^"]*)"$/ do |email, comment_text user.comment!(post, comment_text) end +Given /^"([^"]*)" has commented mentioning "([^"]*)" on "([^"]*)"$/ do |email, mentionee_email, post_text| + user = User.find_by(email: email) + post = StatusMessage.find_by(text: post_text) + user.comment!(post, text_mentioning(User.find_by(email: mentionee_email))) +end + Given /^"([^"]*)" has commented a lot on "([^"]*)"$/ do |email, post_text| user = User.find_by(email: email) post = StatusMessage.find_by(text: post_text) @@ -32,3 +38,7 @@ Given /^"([^"]*)" has commented a lot on "([^"]*)"$/ do |email, post_text| end end end + +When /^I enter "([^"]*)" in the comment field$/ do |comment_text| + find("textarea.comment_box.mention-textarea").native.send_keys(comment_text) +end diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index c72deff6a..812a66f34 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -109,6 +109,7 @@ When /^I click to delete the first post$/ do accept_alert do step "I prepare the deletion of the first post" end + expect(find(".stream")).to have_no_css(".stream-element.loaded.deleting") end When /^I click to hide the first post$/ do @@ -176,7 +177,7 @@ end Then /^(?:|I )should see a "([^\"]*)"(?: within "([^\"]*)")?$/ do |selector, scope_selector| with_scope(scope_selector) do - current_scope.should have_css selector + expect(current_scope).to have_css(selector) end end diff --git a/features/step_definitions/keyboard_navigation_steps.rb b/features/step_definitions/keyboard_navigation_steps.rb index e0109902d..32188aff3 100644 --- a/features/step_definitions/keyboard_navigation_steps.rb +++ b/features/step_definitions/keyboard_navigation_steps.rb @@ -5,7 +5,7 @@ When /^I press the "([^\"]*)" key somewhere$/ do |key| end When /^I press the "([^\"]*)" key in the publisher$/ do |key| - find("#status_message_fake_text").native.send_key(key) + find("#status_message_text").native.send_key(key) end Then /^post (\d+) should be highlighted$/ do |position| diff --git a/features/step_definitions/notifications_steps.rb b/features/step_definitions/notifications_steps.rb index 87c27ceff..bd38c03f0 100644 --- a/features/step_definitions/notifications_steps.rb +++ b/features/step_definitions/notifications_steps.rb @@ -3,7 +3,7 @@ When "I filter notifications by likes" do end When "I filter notifications by mentions" do - step %(I follow "Mentioned" within "#notifications_container .list-group") + step %(I follow "Mentioned in post" within "#notifications_container .list-group") end Then /^I should( not)? have activated notifications for the post( in the single post view)?$/ do |negate, spv| @@ -25,10 +25,6 @@ And "I scroll down on the notifications dropdown" do page.execute_script("$('.notifications').scrollTop(350)") end -Then "the notification dropdown should load more notifications" do - expect(find("#notification-dropdown")).to have_css(".loading") -end - Then "the notification dropdown should be visible" do expect(find(:css, "#notification-dropdown")).to be_visible end diff --git a/features/step_definitions/oidc_common_steps.rb b/features/step_definitions/oidc_common_steps.rb index 24f543754..0f7ae95a8 100644 --- a/features/step_definitions/oidc_common_steps.rb +++ b/features/step_definitions/oidc_common_steps.rb @@ -1,5 +1,5 @@ Given /^a client with a provided picture exists for user "([^\"]*)"$/ do |email| - app = FactoryGirl.create(:o_auth_application_with_image) + app = FactoryGirl.create(:o_auth_application, logo_uri: "/assets/user/default.png") user = User.find_by(email: email) FactoryGirl.create(:auth_with_read, user: user, o_auth_application: app) end diff --git a/features/step_definitions/posts_steps.rb b/features/step_definitions/posts_steps.rb index b0b8e62b1..a13779a2c 100644 --- a/features/step_definitions/posts_steps.rb +++ b/features/step_definitions/posts_steps.rb @@ -32,6 +32,10 @@ Then /^I should not be able to submit the publisher$/ do expect(publisher_submittable?).to be false end +Then /^I should see "([^"]*)" in the publisher$/ do |text| + expect(page).to have_field("status_message[text]", with: text) +end + Given /^I have a limited post with text "([^\"]*)" in the aspect "([^"]*)"$/ do |text, aspect_name| @me.post :status_message, text: text, to: @me.aspects.where(name: aspect_name).first.id end @@ -114,10 +118,6 @@ When /^I append "([^"]*)" to the publisher$/ do |text| append_to_publisher(text) end -When /^I append "([^"]*)" to the mobile publisher$/ do |text| - append_to_publisher(text, '#status_message_text') -end - When /^I attach "([^"]*)" to the publisher$/ do |path| upload_file_with_publisher(path) end diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb index f01025a07..7eb0e2b6e 100644 --- a/features/step_definitions/user_steps.rb +++ b/features/step_definitions/user_steps.rb @@ -168,10 +168,14 @@ Then /^I should have (\d+) email delivery$/ do |n| ActionMailer::Base.deliveries.length.should == n.to_i end -Then /^I should not see "([^\"]*)" in the last sent email$/ do |text| +Then /^I should( not)? see "([^\"]*)" in the last sent email$/ do |negate, text| email_text = Devise.mailer.deliveries.first.body.to_s email_text = Devise.mailer.deliveries.first.html_part.body.raw_source if email_text.blank? - email_text.should_not match(text) + if negate + expect(email_text).to_not have_content(text) + else + expect(email_text).to have_content(text) + end end When /^"([^\"]+)" has posted a (public )?status message with a photo$/ do |email, public_status| diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb index f2c564c8f..2ffdd4829 100644 --- a/features/step_definitions/web_steps.rb +++ b/features/step_definitions/web_steps.rb @@ -93,6 +93,8 @@ When /^(?:|I )attach the file "([^"]*)" to (?:hidden )?"([^"]*)"(?: within "([^" page.execute_script("$(\"input[name='#{field}']\").css('opacity', '1');") attach_file(field, Rails.root.join(path).to_s) end + # wait for the image to be ready + page.assert_selector(".loading", count: 0) end Then /^(?:|I )should see (\".+?\"[\s]*)(?:[\s]+within[\s]* "([^"]*)")?$/ do |vars, selector| @@ -186,3 +188,9 @@ end Then /^show me the page$/ do save_and_open_page end + +Then /^I wait until ajax requests finished$/ do + Timeout.timeout(Capybara.default_max_wait_time) do + loop until page.evaluate_script("jQuery.active") == 0 + end +end diff --git a/features/support/env.rb b/features/support/env.rb index 393446b64..cf95b37ef 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -23,7 +23,7 @@ Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, timeout: 80) + Capybara::Poltergeist::Driver.new(app, timeout: 30) end Capybara.javascript_driver = :poltergeist @@ -52,7 +52,7 @@ Capybara.default_max_wait_time = 30 ActionController::Base.allow_rescue = false Cucumber::Rails::Database.autorun_database_cleaner = true -Cucumber::Rails::World.use_transactional_fixtures = false +Cucumber::Rails::World.use_transactional_tests = false require File.join(File.dirname(__FILE__), "integration_sessions_controller") require File.join(File.dirname(__FILE__), "poor_mans_webmock") diff --git a/features/support/publishing_cuke_helpers.rb b/features/support/publishing_cuke_helpers.rb index a3fc5c02e..a6e0593ff 100644 --- a/features/support/publishing_cuke_helpers.rb +++ b/features/support/publishing_cuke_helpers.rb @@ -1,21 +1,13 @@ module PublishingCukeHelpers def write_in_publisher(txt) - fill_in 'status_message_fake_text', with: txt + fill_in "status_message_text", with: txt end - def append_to_publisher(txt, input_selector='#status_message_fake_text') - status_message_text = find("#status_message_text", visible: false).value - find(input_selector).native.send_key(" #{txt}") - - # make sure the other text field got the new contents - if input_selector == "#status_message_fake_text" - begin - expect(page).to have_selector("#status_message_text[value='#{status_message_text} #{txt}']", visible: false) - rescue RSpec::Expectations::ExpectationNotMetError - puts "Value was instead: #{find('#status_message_text', visible: false).value.inspect}" - raise - end - end + def append_to_publisher(txt) + status_message_text = find("#status_message_text").value + fill_in id: "status_message_text", with: "#{status_message_text} #{txt}" + # trigger JavaScript event listeners + find("#status_message_text").native.send_key(:end) end def upload_file_with_publisher(path) @@ -33,7 +25,7 @@ module PublishingCukeHelpers end def submit_publisher - txt = find("#publisher #status_message_fake_text").value + txt = find("#publisher #status_message_text").value find("#publisher .btn-primary").click # wait for the publisher to be closed expect(find("#publisher")["class"]).to include("closed") @@ -47,7 +39,7 @@ module PublishingCukeHelpers end def click_publisher - find("#status_message_fake_text").click + find("#status_message_text").click expect(find("#publisher")).to have_css(".publisher-textarea-wrapper.active") end @@ -103,7 +95,9 @@ module PublishingCukeHelpers def like_stream_post(post_text) within_post(post_text) do - find(:css, 'a.like').click + action = find(:css, "a.like").text + find(:css, "a.like").click + expect(find(:css, "a.like")).not_to have_text(action) end end diff --git a/features/support/user_cuke_helpers.rb b/features/support/user_cuke_helpers.rb index 5ec5e3abb..b7014b0ac 100644 --- a/features/support/user_cuke_helpers.rb +++ b/features/support/user_cuke_helpers.rb @@ -47,7 +47,7 @@ module UserCukeHelpers if mobile expect(page).to have_css "#menu-badge" else - expect(find("#user_menu")).to have_content "#{@me.first_name} #{@me.last_name}" + expect(find("#user-menu")).to have_content "#{@me.first_name} #{@me.last_name}" end end @@ -58,8 +58,8 @@ module UserCukeHelpers # go to user menu, expand it, and click logout def manual_logout - find("#user_menu .dropdown-toggle").click - find("#user_menu li:last-child a").click + find("#user-menu .dropdown-toggle").click + find("#user-menu li:last-child a").click end def manual_logout_mobile @@ -69,8 +69,8 @@ module UserCukeHelpers def fill_in_new_user_form @username = "ohai" - fill_in('user_username', with: @username) fill_in('user_email', with: "#{@username}@example.com") + fill_in('user_username', with: @username) fill_in('user_password', with: 'secret') fill_in('user_password_confirmation', with: 'secret') diff --git a/lib/account_deleter.rb b/lib/account_deleter.rb index 83c31c528..95a5c9130 100644 --- a/lib/account_deleter.rb +++ b/lib/account_deleter.rb @@ -17,9 +17,9 @@ class AccountDeleter attr_accessor :person, :user - def initialize(diaspora_handle) - self.person = Person.where(:diaspora_handle => diaspora_handle).first - self.user = self.person.owner + def initialize(person) + self.person = person + self.user = person.owner end def perform! @@ -30,31 +30,33 @@ class AccountDeleter delete_contacts_of_me tombstone_person_and_profile - if self.user - #user deletion methods - remove_share_visibilities_on_contacts_posts - delete_standard_user_associations - disconnect_contacts - tombstone_user - end + close_user if user mark_account_deletion_complete end end + # user deletion methods + def close_user + remove_share_visibilities_on_contacts_posts + disconnect_contacts + delete_standard_user_associations + tombstone_user + end + #user deletions def normal_ar_user_associates_to_delete - %i(tag_followings services aspects user_preferences - notifications blocks authorizations o_auth_applications pairwise_pseudonymous_identifiers) + %i[tag_followings services aspects user_preferences + notifications blocks authorizations o_auth_applications pairwise_pseudonymous_identifiers] end def special_ar_user_associations - %i(person profile contacts auto_follow_back_aspect) + %i[person profile contacts auto_follow_back_aspect] end def ignored_ar_user_associations - %i(followed_tags invited_by contact_people aspect_memberships - ignored_people share_visibilities conversation_visibilities conversations reports) + %i[followed_tags invited_by invited_users contact_people aspect_memberships + ignored_people share_visibilities conversation_visibilities conversations reports] end def delete_standard_user_associations @@ -97,14 +99,15 @@ class AccountDeleter end def normal_ar_person_associates_to_delete - %i(posts photos mentions participations roles) + %i[posts photos mentions participations roles blocks] end def ignored_or_special_ar_person_associations - %i(comments contacts notification_actors notifications owner profile conversation_visibilities pod) + %i[comments likes poll_participations contacts notification_actors notifications owner profile + conversation_visibilities pod conversations messages] end def mark_account_deletion_complete - AccountDeletion.where(:diaspora_handle => self.person.diaspora_handle).where(:person_id => self.person.id).update_all(["completed_at = ?", Time.now]) + AccountDeletion.find_by(person: person)&.update_attributes(completed_at: Time.now.utc) end end diff --git a/lib/api/openid_connect/token_endpoint.rb b/lib/api/openid_connect/token_endpoint.rb index a2e8c8ac2..7bde221a9 100644 --- a/lib/api/openid_connect/token_endpoint.rb +++ b/lib/api/openid_connect/token_endpoint.rb @@ -50,7 +50,7 @@ module Api end def app_valid?(o_auth_app, req) - o_auth_app.client_secret == req.client_secret + o_auth_app.try(:client_secret) == req.client_secret end end end diff --git a/lib/bookmarklet_renderer.rb b/lib/bookmarklet_renderer.rb index 3114d5a80..0ecc9cf48 100644 --- a/lib/bookmarklet_renderer.rb +++ b/lib/bookmarklet_renderer.rb @@ -2,27 +2,35 @@ class BookmarkletRenderer class << self def cached_name - @cached ||= Rails.root.join("public", "assets", "bookmarklet.js") + @cached_name ||= if Rails.application.config.assets.compile + "bookmarklet.js" + else + Rails.application.assets_manifest.assets["bookmarklet.js"] + end end - def source_name + def cached_path + @cached_path ||= Rails.root.join("public", "assets", cached_name) + end + + def source @source ||= Rails.application.assets["bookmarklet.js"].pathname.to_s end def body - if !File.exist?(cached_name) && Rails.env.production? - raise "please run the Rake task to compile the bookmarklet: `bundle exec rake assets:uglify_bookmarklet`" + unless File.exist?(cached_path) || Rails.application.config.assets.compile + raise "Please run the rake task to compile the bookmarklet: `bin/rake assets:precompile`" end - compile unless Rails.env.production? # don't make me re-run rake in development - @body ||= File.read(cached_name) + compile if Rails.application.config.assets.compile + @body ||= File.read(cached_path) end def compile - src = File.read(source_name) + src = File.read(source) @body = Uglifier.compile(src) - FileUtils.mkdir_p cached_name.dirname - File.open(cached_name, "w") {|f| f.write(@body) } + FileUtils.mkdir_p cached_path.dirname + File.open(cached_path, "w") {|f| f.write(@body) } end end end diff --git a/lib/diaspora/exporter.rb b/lib/diaspora/exporter.rb index e6f65ac7a..2c9e27909 100644 --- a/lib/diaspora/exporter.rb +++ b/lib/diaspora/exporter.rb @@ -6,22 +6,23 @@ module Diaspora class Exporter - SERIALIZED_VERSION = '1.0' + SERIALIZED_VERSION = "2.0".freeze def initialize(user) @user = user end def execute - @export ||= JSON.generate serialized_user.merge(version: SERIALIZED_VERSION) + JSON.generate full_archive end private - def serialized_user - @serialized_user ||= Export::UserSerializer.new(@user).as_json + def full_archive + {version: SERIALIZED_VERSION} + .merge(Export::UserSerializer.new(@user).as_json) + .merge(Export::OthersDataSerializer.new(@user).as_json) end - end end diff --git a/lib/diaspora/exporter/non_contact_authors.rb b/lib/diaspora/exporter/non_contact_authors.rb new file mode 100644 index 000000000..f3cfc4801 --- /dev/null +++ b/lib/diaspora/exporter/non_contact_authors.rb @@ -0,0 +1,36 @@ +module Diaspora + class Exporter + # This class is capable of quering a list of people from authors of given posts that are non-contacts of a given + # user. + class NonContactAuthors + # @param posts [Post::ActiveRecord_Relation] posts that we fetch authors from to make authors list + # @param user [User] a user we fetch a contact list from + def initialize(posts, user) + @posts = posts + @user = user + end + + # Create a request of non-contact authors of the posts for the user + # @return [Post::ActiveRecord_Relation] + def query + Person.where(id: non_contact_authors_ids) + end + + private + + def non_contact_authors_ids + posts_authors_ids - contacts_ids + end + + def posts_authors_ids + posts.pluck(:author_id).uniq + end + + def contacts_ids + user.contacts.pluck(:person_id) + end + + attr_reader :posts, :user + end + end +end diff --git a/lib/diaspora/exporter/others_relayables.rb b/lib/diaspora/exporter/others_relayables.rb new file mode 100644 index 000000000..5876c52cd --- /dev/null +++ b/lib/diaspora/exporter/others_relayables.rb @@ -0,0 +1,42 @@ +module Diaspora + class Exporter + # This class implements methods that allow to query relayables (comments, likes, participations, + # poll_participations) of other people for posts of the given person. + class OthersRelayables + # @param person_id [Integer] Database id of a person for whom we want to request relayalbes + def initialize(person_id) + @person_id = person_id + end + + # Comments of other people to the person's post + # @return [Comment::ActiveRecord_Relation] + def comments + Comment + .where.not(author_id: person_id) + .joins("INNER JOIN posts ON (commentable_type = 'Post' AND posts.id = commentable_id)") + .where("posts.author_id = ?", person_id) + end + + # Likes of other people to the person's post + # @return [Like::ActiveRecord_Relation] + def likes + Like + .where.not(author_id: person_id) + .joins("INNER JOIN posts ON (target_type = 'Post' AND posts.id = target_id)") + .where("posts.author_id = ?", person_id) + end + + # Poll participations of other people to the person's polls + # @return [PollParticipation::ActiveRecord_Relation] + def poll_participations + PollParticipation + .where.not(author_id: person_id).joins(:status_message) + .where("posts.author_id = ?", person_id) + end + + private + + attr_reader :person_id + end + end +end diff --git a/lib/diaspora/exporter/posts_with_activity.rb b/lib/diaspora/exporter/posts_with_activity.rb new file mode 100644 index 000000000..00461c55b --- /dev/null +++ b/lib/diaspora/exporter/posts_with_activity.rb @@ -0,0 +1,59 @@ +module Diaspora + class Exporter + # This class allows to query posts where a person made any activity (submitted comments, + # likes, participations or poll participations). + class PostsWithActivity + # @param user [User] user who the activity belongs to (the one who liked, commented posts, etc) + def initialize(user) + @user = user + end + + # Create a request of posts with activity + # @return [Post::ActiveRecord_Relation] + def query + Post.from("(#{sql_union_all_activities}) AS posts") + end + + private + + attr_reader :user + + def person + user.person + end + + def sql_union_all_activities + all_activities.map(&:to_sql).join(" UNION ") + end + + def all_activities + [comments_activity, likes_activity, subscriptions, polls_activity, reshares_activity] + end + + def likes_activity + other_people_posts.liked_by(person) + end + + def comments_activity + other_people_posts.commented_by(person) + end + + def subscriptions + other_people_posts.subscribed_by(user) + end + + def reshares_activity + other_people_posts.reshared_by(person) + end + + def polls_activity + StatusMessage.where.not(author_id: person.id).joins(:poll_participations) + .where(poll_participations: {author_id: person.id}) + end + + def other_people_posts + Post.where.not(author_id: person.id) + end + end + end +end diff --git a/lib/diaspora/federated.rb b/lib/diaspora/federated.rb index 348364fa0..e00fbd86a 100644 --- a/lib/diaspora/federated.rb +++ b/lib/diaspora/federated.rb @@ -6,5 +6,6 @@ module Diaspora module Federated require "diaspora/federated/base" require "diaspora/federated/retraction" + require "diaspora/federated/contact_retraction" end end diff --git a/lib/diaspora/federated/contact_retraction.rb b/lib/diaspora/federated/contact_retraction.rb new file mode 100644 index 000000000..7ff7cc6f5 --- /dev/null +++ b/lib/diaspora/federated/contact_retraction.rb @@ -0,0 +1,18 @@ +class ContactRetraction < Retraction + def self.entity_class + DiasporaFederation::Entities::Contact + end + + def self.retraction_data_for(target) + Diaspora::Federation::Entities.contact(target).to_h + end + + def self.for(target) + target.receiving = false + super + end + + def public? + false + end +end diff --git a/lib/diaspora/federated/retraction.rb b/lib/diaspora/federated/retraction.rb index f925bbb9a..d6343c6fc 100644 --- a/lib/diaspora/federated/retraction.rb +++ b/lib/diaspora/federated/retraction.rb @@ -14,23 +14,27 @@ class Retraction @target = target end - def self.for(target, sender=nil) - federation_retraction = case target - when Diaspora::Relayable - Diaspora::Federation::Entities.relayable_retraction(target, sender) - when Post - Diaspora::Federation::Entities.signed_retraction(target, sender) - else - Diaspora::Federation::Entities.retraction(target) - end + def self.entity_class + DiasporaFederation::Entities::Retraction + end - new(federation_retraction.to_h, target.subscribers.select(&:remote?), target) + def self.retraction_data_for(target) + DiasporaFederation::Entities::Retraction.new( + target_guid: target.guid, + target: Diaspora::Federation::Entities.related_entity(target), + target_type: Diaspora::Federation::Mappings.entity_name_for(target), + author: target.diaspora_handle + ).to_h + end + + def self.for(target) + federation_retraction_data = retraction_data_for(target) + new(federation_retraction_data, target.subscribers.select(&:remote?), target) end def defer_dispatch(user, include_target_author=true) subscribers = dispatch_subscribers(include_target_author) - sender = dispatch_sender(user) - Workers::DeferredRetraction.perform_async(sender.id, data, subscribers.map(&:id), service_opts(user)) + Workers::DeferredRetraction.perform_async(user.id, self.class.to_s, data, subscribers.map(&:id), service_opts(user)) end def perform @@ -40,8 +44,7 @@ class Retraction end def public? - # TODO: backward compatibility for pre 0.6 pods, they don't relay public retractions - data[:target][:public] == "true" && (!data[:target][:parent] || data[:target][:parent][:local] == "true") + data[:target][:public] end private @@ -53,11 +56,6 @@ class Retraction subscribers end - # @deprecated This is only needed for pre 0.6 pods - def dispatch_sender(user) - target.try(:sender_for_dispatch) || user - end - def service_opts(user) return {} unless target.is_a?(StatusMessage) diff --git a/lib/diaspora/federation/dispatcher.rb b/lib/diaspora/federation/dispatcher.rb index fc79e1092..64b16dae7 100644 --- a/lib/diaspora/federation/dispatcher.rb +++ b/lib/diaspora/federation/dispatcher.rb @@ -31,6 +31,16 @@ module Diaspora attr_reader :sender, :object, :opts + def entity + @entity ||= Entities.build(object) + end + + def magic_envelope + @magic_envelope ||= DiasporaFederation::Salmon::MagicEnvelope.new( + entity, sender.diaspora_handle + ).envelop(sender.encryption_key) + end + def deliver_to_services deliver_to_user_services if opts[:service_types] end diff --git a/lib/diaspora/federation/dispatcher/private.rb b/lib/diaspora/federation/dispatcher/private.rb index ab13756fd..456e1dcec 100644 --- a/lib/diaspora/federation/dispatcher/private.rb +++ b/lib/diaspora/federation/dispatcher/private.rb @@ -7,22 +7,17 @@ module Diaspora def deliver_to_remote(people) return if people.empty? - entity = Entities.build(object) - Workers::SendPrivate.perform_async(sender.id, entity.to_s, targets(people, salmon_slap(entity))) + Workers::SendPrivate.perform_async(sender.id, entity.to_s, targets(people)) end - def targets(people, salmon_slap) + def targets(people) active, inactive = people.partition {|person| person.pod.active? } logger.info "ignoring inactive pods: #{inactive.map(&:diaspora_handle).join(', ')}" if inactive.any? - active.map {|person| [person.receive_url, salmon_slap.generate_xml(person.public_key)] }.to_h + active.map {|person| [person.receive_url, encrypted_magic_envelope(person)] }.to_h end - def salmon_slap(entity) - DiasporaFederation::Salmon::EncryptedSlap.prepare( - sender.diaspora_handle, - sender.encryption_key, - entity - ) + def encrypted_magic_envelope(person) + DiasporaFederation::Salmon::EncryptedMagicEnvelope.encrypt(magic_envelope, person.public_key) end end end diff --git a/lib/diaspora/federation/dispatcher/public.rb b/lib/diaspora/federation/dispatcher/public.rb index c91979c20..b8ad30bff 100644 --- a/lib/diaspora/federation/dispatcher/public.rb +++ b/lib/diaspora/federation/dispatcher/public.rb @@ -14,8 +14,7 @@ module Diaspora return if targets.empty? - entity = Entities.build(object) - Workers::SendPublic.perform_async(sender.id, entity.to_s, targets, salmon_xml(entity)) + Workers::SendPublic.perform_async(sender.id, entity.to_s, targets, magic_envelope.to_xml) end def target_urls(people) @@ -29,14 +28,6 @@ module Diaspora [AppConfig.relay.outbound.url] end - def salmon_xml(entity) - DiasporaFederation::Salmon::Slap.generate_xml( - sender.diaspora_handle, - sender.encryption_key, - entity - ) - end - def deliver_to_hub logger.debug "deliver to pubsubhubbub sender: #{sender.diaspora_handle}" Workers::PublishToHub.perform_async(sender.atom_url) diff --git a/lib/diaspora/federation/entities.rb b/lib/diaspora/federation/entities.rb index f806ec158..0a9bd8af4 100644 --- a/lib/diaspora/federation/entities.rb +++ b/lib/diaspora/federation/entities.rb @@ -2,18 +2,7 @@ module Diaspora module Federation module Entities def self.build(entity) - public_send(Mappings.builder_for(entity.class), entity) - end - - def self.build_retraction(retraction) - case retraction.data[:target_type] - when "Comment", "Like", "PollParticipation" - DiasporaFederation::Entities::RelayableRetraction.new(retraction.data) - when "Post" - DiasporaFederation::Entities::SignedRetraction.new(retraction.data) - else - DiasporaFederation::Entities::Retraction.new(retraction.data) - end + public_send(Mappings.builder_for(entity), entity) end def self.post(post) @@ -33,6 +22,13 @@ module Diaspora ) end + def self.account_migration(account_migration) + DiasporaFederation::Entities::AccountMigration.new( + author: account_migration.sender.diaspora_handle, + profile: profile(account_migration.new_person.profile) + ) + end + def self.comment(comment) DiasporaFederation::Entities::Comment.new( { @@ -50,10 +46,11 @@ module Diaspora end def self.contact(contact) - # TODO: use DiasporaFederation::Entities::Contact - DiasporaFederation::Entities::Request.new( + DiasporaFederation::Entities::Contact.new( author: contact.user.diaspora_handle, - recipient: contact.person.diaspora_handle + recipient: contact.person.diaspora_handle, + sharing: contact.receiving, + following: contact.receiving ) end @@ -98,10 +95,7 @@ module Diaspora guid: message.guid, text: message.text, created_at: message.created_at, - parent_guid: message.conversation.guid, - conversation_guid: message.conversation.guid, - author_signature: message.author_signature, - parent: related_entity(message.conversation) + conversation_guid: message.conversation.guid ) end @@ -110,8 +104,7 @@ module Diaspora author: participation.diaspora_handle, guid: participation.guid, parent_guid: participation.target.guid, - parent_type: Mappings.entity_name_for(participation.target), - parent: related_entity(participation.target) + parent_type: Mappings.entity_name_for(participation.target) ) end @@ -174,17 +167,8 @@ module Diaspora location: profile.location, searchable: profile.searchable, nsfw: profile.nsfw, - tag_string: profile.tag_string - ) - end - - # @deprecated - def self.relayable_retraction(target, sender) - DiasporaFederation::Entities::RelayableRetraction.new( - target_guid: target.guid, - target_type: Mappings.entity_name_for(target), - target: related_entity(target), - author: sender.diaspora_handle + tag_string: profile.tag_string, + public: profile.public_details ) end @@ -200,35 +184,8 @@ module Diaspora ) end - def self.retraction(target) - case target - when Contact - # TODO: deprecated - author = target.user.diaspora_handle - DiasporaFederation::Entities::Retraction.new( - target_guid: target.user.guid, - target_type: "Person", - target: DiasporaFederation::Entities::RelatedEntity.new(author: author, local: true), - author: author - ) - else - DiasporaFederation::Entities::Retraction.new( - target_guid: target.guid, - target_type: Mappings.entity_name_for(target), - target: related_entity(target), - author: target.diaspora_handle - ) - end - end - - # @deprecated - def self.signed_retraction(target, sender) - DiasporaFederation::Entities::SignedRetraction.new( - target_guid: target.guid, - target_type: Mappings.entity_name_for(target), - target: related_entity(target), - author: sender.diaspora_handle - ) + def self.retraction(retraction) + retraction.class.entity_class.new(retraction.data) end def self.status_message(status_message) diff --git a/lib/diaspora/federation/mappings.rb b/lib/diaspora/federation/mappings.rb index 2b761b697..ec344cab2 100644 --- a/lib/diaspora/federation/mappings.rb +++ b/lib/diaspora/federation/mappings.rb @@ -1,81 +1,82 @@ module Diaspora module Federation module Mappings + # rubocop:disable Metrics/CyclomaticComplexity + # used in Diaspora::Federation::Receive - def self.receiver_for(federation_class) - fetch_from(ENTITY_RECEIVERS, federation_class) + def self.receiver_for(federation_entity) + case federation_entity + when DiasporaFederation::Entities::AccountMigration then :account_migration + when DiasporaFederation::Entities::Comment then :comment + when DiasporaFederation::Entities::Contact then :contact + when DiasporaFederation::Entities::Conversation then :conversation + when DiasporaFederation::Entities::Like then :like + when DiasporaFederation::Entities::Message then :message + when DiasporaFederation::Entities::Participation then :participation + when DiasporaFederation::Entities::Photo then :photo + when DiasporaFederation::Entities::PollParticipation then :poll_participation + when DiasporaFederation::Entities::Profile then :profile + when DiasporaFederation::Entities::Reshare then :reshare + when DiasporaFederation::Entities::StatusMessage then :status_message + else not_found(federation_entity.class) + end end # used in Diaspora::Federation::Entities - def self.builder_for(diaspora_class) - fetch_from(ENTITY_BUILDERS, diaspora_class) + def self.builder_for(diaspora_entity) + case diaspora_entity + when AccountMigration then :account_migration + when AccountDeletion then :account_deletion + when Comment then :comment + when Contact then :contact + when Conversation then :conversation + when Like then :like + when Message then :message + when Participation then :participation + when Photo then :photo + when PollParticipation then :poll_participation + when Profile then :profile + when Reshare then :reshare + when Retraction then :retraction + when ContactRetraction then :retraction + when StatusMessage then :status_message + else not_found(diaspora_entity.class) + end end def self.model_class_for(entity_name) - fetch_from(ENTITY_MODELS, entity_name) + case entity_name + when "Comment" then Comment + when "Conversation" then Conversation + when "Like" then Like + when "Participation" then Participation + when "PollParticipation" then PollParticipation + when "Photo" then Photo + when "Poll" then Poll + when "Post" then Post + when "Person" then Person # TODO: deprecated + when "Reshare" then Post + when "StatusMessage" then Post + else not_found(entity_name) + end end def self.entity_name_for(model) - fetch_from(ENTITY_NAMES, model.class.base_class) + case model + when Comment then "Comment" + when Like then "Like" + when Participation then "Participation" + when PollParticipation then "PollParticipation" + when Photo then "Photo" + when Post then "Post" + else not_found(model.class) + end end + # rubocop:enable Metrics/CyclomaticComplexity - private_class_method def self.fetch_from(mapping, key) - mapping.fetch(key) { raise DiasporaFederation::Entity::UnknownEntity, "unknown entity: #{key}" } + private_class_method def self.not_found(key) + raise DiasporaFederation::Entity::UnknownEntity, "unknown entity: #{key}" end - - ENTITY_RECEIVERS = { - DiasporaFederation::Entities::Comment => :comment, - DiasporaFederation::Entities::Contact => :contact, - DiasporaFederation::Entities::Conversation => :conversation, - DiasporaFederation::Entities::Like => :like, - DiasporaFederation::Entities::Message => :message, - DiasporaFederation::Entities::Participation => :participation, - DiasporaFederation::Entities::Photo => :photo, - DiasporaFederation::Entities::PollParticipation => :poll_participation, - DiasporaFederation::Entities::Profile => :profile, - DiasporaFederation::Entities::Reshare => :reshare, - DiasporaFederation::Entities::StatusMessage => :status_message - }.freeze - - ENTITY_BUILDERS = { - AccountDeletion => :account_deletion, - Comment => :comment, - Contact => :contact, - Conversation => :conversation, - Like => :like, - Message => :message, - Participation => :participation, - Photo => :photo, - PollParticipation => :poll_participation, - Profile => :profile, - Reshare => :reshare, - Retraction => :build_retraction, - StatusMessage => :status_message - }.freeze - - ENTITY_MODELS = { - "Comment" => Comment, - "Conversation" => Conversation, - "Like" => Like, - "Participation" => Participation, - "PollParticipation" => PollParticipation, - "Photo" => Photo, - "Poll" => Poll, - "Post" => Post, - # TODO: deprecated - "Person" => Person, - "Reshare" => Post, - "StatusMessage" => Post - }.freeze - - ENTITY_NAMES = { - Comment => "Comment", - Like => "Like", - Participation => "Participation", - PollParticipation => "PollParticipation", - Photo => "Photo", - Post => "Post" - }.freeze end end end diff --git a/lib/diaspora/federation/receive.rb b/lib/diaspora/federation/receive.rb index a61566402..d130cab68 100644 --- a/lib/diaspora/federation/receive.rb +++ b/lib/diaspora/federation/receive.rb @@ -4,11 +4,19 @@ module Diaspora extend Diaspora::Logging def self.perform(entity) - public_send(Mappings.receiver_for(entity.class), entity) + public_send(Mappings.receiver_for(entity), entity) end def self.account_deletion(entity) - AccountDeletion.create!(person: author_of(entity), diaspora_handle: entity.author) + AccountDeletion.create!(person: author_of(entity)) + end + + def self.account_migration(entity) + profile = profile(entity.profile) + AccountMigration.create!( + old_person: Person.by_account_identifier(entity.author), + new_person: profile.person + ) end def self.comment(entity) @@ -25,7 +33,7 @@ module Diaspora def self.contact(entity) recipient = Person.find_by(diaspora_handle: entity.recipient).owner - if entity.sharing.to_s == "true" + if entity.sharing Contact.create_or_update_sharing_contact(recipient, author_of(entity)) else recipient.disconnected_by(author_of(entity)) @@ -59,7 +67,9 @@ module Diaspora end def self.message(entity) - save_message(entity).tap {|message| relay_relayable(message) if message } + ignore_existing_guid(Message, entity.guid, author_of(entity)) do + build_message(entity).tap(&:save!) + end end def self.participation(entity) @@ -120,7 +130,8 @@ module Diaspora location: entity.location, searchable: entity.searchable, nsfw: entity.nsfw, - tag_string: entity.tag_string + tag_string: entity.tag_string, + public_details: entity.public ) end end @@ -149,7 +160,7 @@ module Diaspora when Diaspora::Relayable if object.parent.author.local? parent_author = object.parent.author.owner - retraction = Retraction.for(object, parent_author) + retraction = Retraction.for(object) retraction.defer_dispatch(parent_author, false) retraction.perform else @@ -209,21 +220,13 @@ module Diaspora poll.poll_answers = entity.poll_answers.map do |answer| PollAnswer.new( guid: answer.guid, - answer: answer.answer + answer: answer.answer, + poll: poll ) end end end - private_class_method def self.save_message(entity) - ignore_existing_guid(Message, entity.guid, author_of(entity)) do - build_message(entity).tap do |message| - message.author_signature = entity.author_signature if message.conversation.author.local? - message.save! - end - end - end - private_class_method def self.save_photo(entity) Photo.create!( author: author_of(entity), @@ -263,8 +266,8 @@ module Diaspora private_class_method def self.build_signature(klass, entity) klass.reflect_on_association(:signature).klass.new( author_signature: entity.author_signature, - additional_data: entity.additional_xml_elements, - signature_order: SignatureOrder.find_or_create_by!(order: entity.xml_order.join(" ")) + additional_data: entity.additional_data, + signature_order: SignatureOrder.find_or_create_by!(order: entity.signature_order.join(" ")) ) end @@ -272,7 +275,7 @@ module Diaspora parent_author = relayable.parent.author.owner return unless parent_author && parent_author.ignored_people.include?(relayable.author) - retraction = Retraction.for(relayable, parent_author) + retraction = Retraction.for(relayable) Diaspora::Federation::Dispatcher.build(parent_author, retraction, subscribers: [relayable.author]).dispatch raise Diaspora::Federation::AuthorIgnored diff --git a/lib/diaspora/fetcher/public.rb b/lib/diaspora/fetcher/public.rb index 34af2f30e..1a7fbd7ee 100644 --- a/lib/diaspora/fetcher/public.rb +++ b/lib/diaspora/fetcher/public.rb @@ -102,25 +102,16 @@ module Diaspora; module Fetcher; class Public logger.debug "post: #{post.to_s[0..250]}" - # disable some stuff we don't want for bulk inserts - StatusMessage.skip_callback :create, :set_guid - entry = StatusMessage.diaspora_initialize( - :author => @person, - :public => true - ) - entry.assign_attributes( + author: @person, + public: true, guid: post["guid"], text: post["text"], provider_display_name: post["provider_display_name"], created_at: ActiveSupport::TimeZone.new("UTC").parse(post["created_at"]).to_datetime, - interacted_at: ActiveSupport::TimeZone.new("UTC").parse(post["interacted_at"]).to_datetime ) entry.save - # re-enable everything we disabled before - StatusMessage.set_callback :create, :set_guid - end set_fetch_status Public::Status_Processed end diff --git a/lib/diaspora/fields/target.rb b/lib/diaspora/fields/target.rb index 1fbbf9796..7120c2a84 100644 --- a/lib/diaspora/fields/target.rb +++ b/lib/diaspora/fields/target.rb @@ -6,7 +6,6 @@ module Diaspora belongs_to :target, polymorphic: true validates :target_id, uniqueness: {scope: %i(target_type author_id)} - validates :target, presence: true end end end diff --git a/lib/diaspora/mentionable.rb b/lib/diaspora/mentionable.rb index 8645d9020..fb6117a45 100644 --- a/lib/diaspora/mentionable.rb +++ b/lib/diaspora/mentionable.rb @@ -1,23 +1,20 @@ module Diaspora::Mentionable - # regex for finding mention markup in plain text - # ex. + # regex for finding mention markup in plain text: + # "message @{user@pod.net} text" + # it can also contain a name, which gets used as the link text: # "message @{User Name; user@pod.net} text" # will yield "User Name" and "user@pod.net" - REGEX = /(@\{(.+?; [^\}]+)\})/ + REGEX = /@\{(?:([^\}]+?); )?([^\} ]+)\}/ # class attribute that will be added to all mention html links PERSON_HREF_CLASS = "mention hovercardable" def self.mention_attrs(mention_str) - mention = mention_str.match(REGEX)[2] - del_pos = mention.rindex(/;/) + name, diaspora_id = mention_str.match(REGEX).captures - name = mention[0..(del_pos - 1)].strip - handle = mention[(del_pos + 1)..-1].strip - - [name, handle] + [name.try(:strip).presence, diaspora_id.strip] end # takes a message text and returns the text with mentions in (html escaped) @@ -32,10 +29,10 @@ module Diaspora::Mentionable people = [*people] msg_text.to_s.gsub(REGEX) {|match_str| - name, handle = mention_attrs(match_str) - person = people.find {|p| p.diaspora_handle == handle } + name, diaspora_id = mention_attrs(match_str) + person = people.find {|p| p.diaspora_handle == diaspora_id } - ERB::Util.h(MentionsInternal.mention_link(person, name, opts)) + "@#{ERB::Util.h(MentionsInternal.mention_link(person, name, diaspora_id, opts))}" } end @@ -45,43 +42,49 @@ module Diaspora::Mentionable # @param [String] text containing mentions # @return [Array
" + renderedText + "
");
+ expect(renderedPreview).toContain("Alice Awesome");
+ });
});
describe("createComment", function() {
@@ -110,6 +152,18 @@ describe("app.views.CommentStream", function(){
this.request.respondWith({status: 200, responseText: "[]"});
expect(autosize.update).toHaveBeenCalledWith(this.view.commentBox);
});
+
+ it("hides the markdown preview", function() {
+ spyOn(this.view.mdEditor, "hidePreview");
+ this.request.respondWith({status: 200, responseText: "[]"});
+ expect(this.view.mdEditor.hidePreview).toHaveBeenCalled();
+ });
+
+ it("closes the form", function() {
+ spyOn(this.view, "closeForm");
+ this.request.respondWith({status: 200, responseText: "[]"});
+ expect(this.view.closeForm).toHaveBeenCalled();
+ });
});
context("on error", function() {
@@ -128,6 +182,18 @@ describe("app.views.CommentStream", function(){
this.request.respondWith({status: 500});
expect(this.view.enableCommentBox).toHaveBeenCalled();
});
+
+ it("hides the markdown preview", function() {
+ spyOn(this.view.mdEditor, "hidePreview");
+ this.request.respondWith({status: 500, responseText: "[]"});
+ expect(this.view.mdEditor.hidePreview).toHaveBeenCalled();
+ });
+
+ it("opens the form", function() {
+ spyOn(this.view, "openForm");
+ this.request.respondWith({status: 500, responseText: "[]"});
+ expect(this.view.openForm).toHaveBeenCalled();
+ });
});
});
});
@@ -201,6 +267,14 @@ describe("app.views.CommentStream", function(){
expect(this.view.$(".comments div.comment.media").length).toEqual(6);
expect(this.view.$(".comments div.comment.media div.comment-content p").text()).toEqual("123456");
});
+
+ it("calls renderPluginWidgets", function() {
+ var comment = factory.comment();
+ this.view.CommentView = app.views.Comment;
+ spyOn(app.views.Comment.prototype, "renderPluginWidgets");
+ this.view.appendComment(comment);
+ expect(app.views.Comment.prototype.renderPluginWidgets).toHaveBeenCalled();
+ });
});
describe("removeComment", function() {
@@ -276,6 +350,84 @@ describe("app.views.CommentStream", function(){
});
});
+ describe("openForm", function() {
+ beforeEach(function() {
+ this.view.render();
+ });
+
+ it("adds the 'open' class to form", function() {
+ this.view.$("form").removeClass("open");
+ this.view.openForm();
+ expect(this.view.$("form")).toHaveClass("open");
+ });
+
+ it("adds the 'active' class to markdown editor", function() {
+ this.view.$(".md-editor").removeClass("active");
+ this.view.openForm();
+ expect(this.view.$(".md-editor")).toHaveClass("active");
+ });
+ });
+
+ describe("closeForm", function() {
+ beforeEach(function() {
+ this.view.render();
+ });
+
+ it("removes the 'open' class to form", function() {
+ this.view.$("form").addClass("open");
+ this.view.closeForm();
+ expect(this.view.$("form")).not.toHaveClass("open");
+ });
+
+ it("removes the 'active' class to markdown editor", function() {
+ this.view.$(".md-editor").addClass("active");
+ this.view.closeForm();
+ expect(this.view.$(".md-editor")).not.toHaveClass("active");
+ });
+ });
+
+ describe("onFormBlur", function() {
+ beforeEach(function() {
+ this.view.render();
+ this.view.postRenderTemplate();
+ spec.content().html("");
+ });
+
+ it("does not call closeForm if markdown editor is in preview mode", function() {
+ spyOn(this.view, "closeForm");
+ spyOn(this.view.mdEditor, "isPreviewMode").and.returnValue(true);
+ spyOn(this.view.mdEditor, "userInputEmpty").and.returnValue(true);
+ this.view.onFormBlur();
+ expect(this.view.closeForm).not.toHaveBeenCalled();
+ });
+
+ it("does not call closeForm if markdown editor contains text", function() {
+ spyOn(this.view, "closeForm");
+ spyOn(this.view.mdEditor, "isPreviewMode").and.returnValue(false);
+ spyOn(this.view.mdEditor, "userInputEmpty").and.returnValue(false);
+ this.view.onFormBlur();
+ expect(this.view.closeForm).not.toHaveBeenCalled();
+ });
+
+ it("does not call closeForm when the form is clicked", function() {
+ spyOn(this.view, "closeForm");
+ spyOn(this.view.mdEditor, "isPreviewMode").and.returnValue(false);
+ spyOn(this.view.mdEditor, "userInputEmpty").and.returnValue(true);
+ this.view.onFormBlur($.Event("click", {target: $(".new-comment")}));
+ expect(this.view.closeForm).not.toHaveBeenCalled();
+ this.view.onFormBlur($.Event("click", {target: $(".focus_comment_textarea")}));
+ expect(this.view.closeForm).not.toHaveBeenCalled();
+ });
+
+ it("calls closeForm when the user clicks outside of the form", function() {
+ spyOn(this.view, "closeForm");
+ spyOn(this.view.mdEditor, "isPreviewMode").and.returnValue(false);
+ spyOn(this.view.mdEditor, "userInputEmpty").and.returnValue(true);
+ this.view.onFormBlur($.Event("click", {target: $("body")}));
+ expect(this.view.closeForm).toHaveBeenCalled();
+ });
+ });
+
describe("pressing a key when typing on the new comment box", function(){
var submitCallback;
@@ -283,23 +435,34 @@ describe("app.views.CommentStream", function(){
submitCallback = jasmine.createSpy().and.returnValue(false);
});
- it("should not submit the form when enter key is pressed", function(){
+ it("should not submit the form without the ctrl or cmd keys", function() {
this.view.render();
var form = this.view.$("form");
form.submit(submitCallback);
- var e = $.Event("keydown", { which: Keycodes.ENTER, ctrlKey: false });
+ var e = $.Event("keydown", {which: Keycodes.ENTER, ctrlKey: false, metaKey: false});
this.view.keyDownOnCommentBox(e);
expect(submitCallback).not.toHaveBeenCalled();
});
- it("should submit the form when enter is pressed with ctrl", function(){
+ it("should submit the form when enter is pressed with ctrl", function() {
this.view.render();
var form = this.view.$("form");
form.submit(submitCallback);
- var e = $.Event("keydown", { which: Keycodes.ENTER, ctrlKey: true });
+ var e = $.Event("keydown", {which: Keycodes.ENTER, ctrlKey: true});
+ this.view.keyDownOnCommentBox(e);
+
+ expect(submitCallback).toHaveBeenCalled();
+ });
+
+ it("should submit the form when enter is pressed with cmd", function() {
+ this.view.render();
+ var form = this.view.$("form");
+ form.submit(submitCallback);
+
+ var e = $.Event("keydown", {which: Keycodes.ENTER, metaKey: true});
this.view.keyDownOnCommentBox(e);
expect(submitCallback).toHaveBeenCalled();
diff --git a/spec/javascripts/app/views/content_view_spec.js b/spec/javascripts/app/views/content_view_spec.js
index 90fa3c4af..2315b4473 100644
--- a/spec/javascripts/app/views/content_view_spec.js
+++ b/spec/javascripts/app/views/content_view_spec.js
@@ -4,11 +4,17 @@ describe("app.views.Content", function(){
this.view = new app.views.Content({model : this.post});
});
- describe("rendering", function(){
+ describe("smallPhotos", function() {
it("should return all but the first photo from the post", function() {
this.post.set({photos : [1,2]}); // set 2 Photos
expect(this.view.smallPhotos().length).toEqual(1);
});
+
+ it("shouldn't change the photos array", function() {
+ this.post.set({photos: [1, 2]}); // set 2 Photos
+ this.view.smallPhotos();
+ expect(this.post.get("photos").length).toEqual(2);
+ });
});
describe("presenter", function(){
diff --git a/spec/javascripts/app/views/conversations_form_view_spec.js b/spec/javascripts/app/views/conversations_form_view_spec.js
index 232a7f7de..b0d065350 100644
--- a/spec/javascripts/app/views/conversations_form_view_spec.js
+++ b/spec/javascripts/app/views/conversations_form_view_spec.js
@@ -35,6 +35,21 @@ describe("app.views.ConversationsForm", function() {
this.target.initialize({prefill: {}});
expect(app.views.ConversationsForm.prototype.prefill).toHaveBeenCalledWith({});
});
+
+ it("creates markdown editor for new conversations", function() {
+ spyOn(this.target, "renderMarkdownEditor");
+ this.target.initialize();
+ expect(this.target.renderMarkdownEditor).toHaveBeenCalledWith("#new-message-text");
+ });
+ });
+
+ describe("renderMarkdownEditor", function() {
+ it("creates MarkdownEditor", function() {
+ spec.content().html("");
+ var mdEditor = this.target.renderMarkdownEditor("#new-message-text");
+ expect(mdEditor).toEqual(jasmine.any(Diaspora.MarkdownEditor));
+ expect($("#new-message-text")).toHaveClass("md-input");
+ });
});
describe("addRecipient", function() {
@@ -149,9 +164,16 @@ describe("app.views.ConversationsForm", function() {
expect(this.submitCallback).toHaveBeenCalled();
});
- it("shouldn't submit the form without the ctrl key", function() {
+ it("should submit the form with cmd+enter", function() {
$("#new-conversation").submit(this.submitCallback);
- var e = $.Event("keydown", {which: Keycodes.ENTER, ctrlKey: false});
+ var e = $.Event("keydown", {which: Keycodes.ENTER, metaKey: true});
+ $("#new-message-text").trigger(e);
+ expect(this.submitCallback).toHaveBeenCalled();
+ });
+
+ it("shouldn't submit the form without the ctrl or cmd key", function() {
+ $("#new-conversation").submit(this.submitCallback);
+ var e = $.Event("keydown", {which: Keycodes.ENTER, ctrlKey: false, metaKey: false});
$("#new-message-text").trigger(e);
expect(this.submitCallback).not.toHaveBeenCalled();
});
@@ -170,9 +192,16 @@ describe("app.views.ConversationsForm", function() {
expect(this.submitCallback).toHaveBeenCalled();
});
- it("shouldn't submit the form without the ctrl key", function() {
+ it("should submit the form with cmd+enter", function() {
$("#response-message").submit(this.submitCallback);
- var e = $.Event("keydown", {which: Keycodes.ENTER, ctrlKey: false});
+ var e = $.Event("keydown", {which: Keycodes.ENTER, metaKey: true});
+ $("#response-message-text").trigger(e);
+ expect(this.submitCallback).toHaveBeenCalled();
+ });
+
+ it("shouldn't submit the form without the ctrl or cmd key", function() {
+ $("#response-message").submit(this.submitCallback);
+ var e = $.Event("keydown", {which: Keycodes.ENTER, ctrlKey: false, metaKey: false});
$("#response-message-text").trigger(e);
expect(this.submitCallback).not.toHaveBeenCalled();
});
@@ -253,6 +282,12 @@ describe("app.views.ConversationsForm", function() {
$("#new-conversation").trigger("ajax:success", [{id: 23}]);
expect(app._changeLocation).toHaveBeenCalledWith(Routes.conversation(23));
});
+
+ it("hides the preview", function() {
+ spyOn(Diaspora.MarkdownEditor.prototype, "hidePreview");
+ $("#new-conversation").trigger("ajax:success", [{id: 23}]);
+ expect(Diaspora.MarkdownEditor.prototype.hidePreview).toHaveBeenCalled();
+ });
});
describe("conversationCreateError", function() {
diff --git a/spec/javascripts/app/views/conversations_inbox_view_spec.js b/spec/javascripts/app/views/conversations_inbox_view_spec.js
index 841f189f0..f1c539a24 100644
--- a/spec/javascripts/app/views/conversations_inbox_view_spec.js
+++ b/spec/javascripts/app/views/conversations_inbox_view_spec.js
@@ -17,6 +17,14 @@ describe("app.views.ConversationsInbox", function() {
new app.views.ConversationsInbox();
expect(app.views.ConversationsInbox.prototype.setupConversation).toHaveBeenCalled();
});
+
+ it("creates markdown editor for an existing conversation", function() {
+ spyOn(app.views.ConversationsForm.prototype, "renderMarkdownEditor");
+ new app.views.ConversationsInbox(1);
+ expect(app.views.ConversationsForm.prototype.renderMarkdownEditor).toHaveBeenCalledWith(
+ "#conversation-show .conversation-message-text"
+ );
+ });
});
describe("renderConversation", function() {
@@ -34,6 +42,8 @@ describe("app.views.ConversationsInbox", function() {
spyOn($, "ajax").and.callThrough();
spyOn(app.views.ConversationsInbox.prototype, "selectConversation");
spyOn(app.views.ConversationsInbox.prototype, "setupConversation");
+ spyOn(app.views.ConversationsForm.prototype, "renderMarkdownEditor");
+ spyOn(window, "autosize");
this.target.renderConversation(this.conversationId);
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200,
@@ -44,6 +54,9 @@ describe("app.views.ConversationsInbox", function() {
expect(jasmine.Ajax.requests.mostRecent().url).toBe("/conversations/" + this.conversationId + "/raw");
expect(app.views.ConversationsInbox.prototype.selectConversation).toHaveBeenCalledWith(this.conversationId);
expect(app.views.ConversationsInbox.prototype.setupConversation).toHaveBeenCalled();
+ expect(app.views.ConversationsForm.prototype.renderMarkdownEditor).toHaveBeenCalled();
+ expect(window.autosize).toHaveBeenCalled();
+ expect(window.autosize.calls.mostRecent().args[0].is($("#conversation-show textarea")));
expect($("#conversation-new")).toHaveClass("hidden");
expect($("#conversation-show")).not.toHaveClass("hidden");
expect($("#conversation-show #fake-conversation-content").length).toBe(1);
diff --git a/spec/javascripts/app/views/header_view_spec.js b/spec/javascripts/app/views/header_view_spec.js
index 3bf13978f..56c2272e7 100644
--- a/spec/javascripts/app/views/header_view_spec.js
+++ b/spec/javascripts/app/views/header_view_spec.js
@@ -5,7 +5,6 @@ describe("app.views.Header", function() {
loginAs(this.userAttrs);
spec.loadFixture("aspects_index");
- gon.appConfig = {settings: {podname: "MyPod"}};
app.notificationsCollection = new app.collections.Notifications();
this.view = new app.views.Header().render();
});
@@ -45,13 +44,13 @@ describe("app.views.Header", function() {
it("displays if the current user is an admin", function(){
loginAs(_.extend(this.userAttrs, {admin : true}));
this.view.render();
- expect(this.view.$("#user_menu").html()).toContain("/admins");
+ expect(this.view.$("#user-menu").html()).toContain("/admins");
});
it("does not display if the current user is not an admin", function(){
loginAs(_.extend(this.userAttrs, {admin : false}));
this.view.render();
- expect(this.view.$("#user_menu").html()).not.toContain("/admins");
+ expect(this.view.$("#user-menu").html()).not.toContain("/admins");
});
});
});
diff --git a/spec/javascripts/app/views/help_view_spec.js b/spec/javascripts/app/views/help_view_spec.js
index 38717a620..e73830267 100644
--- a/spec/javascripts/app/views/help_view_spec.js
+++ b/spec/javascripts/app/views/help_view_spec.js
@@ -52,26 +52,21 @@ describe("app.views.Help", function(){
expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_private_posts')).toBeTruthy();
});
- it('should show private profiles section', function(){
- this.view.$el.find('a[data-section=private_profiles]').trigger('click');
- expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_private_profiles')).toBeTruthy();
- });
-
it('should show public posts section', function(){
this.view.$el.find('a[data-section=public_posts]').trigger('click');
expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_public_posts')).toBeTruthy();
});
- it('should show public profiles section', function(){
- this.view.$el.find('a[data-section=public_profiles]').trigger('click');
- expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_public_profiles')).toBeTruthy();
- });
-
it('should show resharing posts section', function(){
this.view.$el.find('a[data-section=resharing_posts]').trigger('click');
expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_resharing_posts')).toBeTruthy();
});
+ it("should show profile section", function() {
+ this.view.$el.find("a[data-section=profile]").trigger("click");
+ expect(this.view.$el.find("#faq").children().first().hasClass("faq_question_profile")).toBeTruthy();
+ });
+
it('should show sharing section', function(){
this.view.$el.find('a[data-section=sharing]').trigger('click');
expect(this.view.$el.find('#faq').children().first().data('template')).toBe('faq_sharing');
diff --git a/spec/javascripts/app/views/notifications_view_spec.js b/spec/javascripts/app/views/notifications_view_spec.js
index 4e520a57c..d15e21bc1 100644
--- a/spec/javascripts/app/views/notifications_view_spec.js
+++ b/spec/javascripts/app/views/notifications_view_spec.js
@@ -142,18 +142,13 @@ describe("app.views.Notifications", function() {
});
it("changes the header notifications count", function() {
- var badge1 = $(".notifications-link:eq(0) .badge");
- var badge2 = $(".notifications-link:eq(1) .badge");
+ var badge = $(".notifications-link .badge");
- expect(parseInt(badge1.text(), 10)).toBe(this.collection.unreadCount);
- expect(parseInt(badge2.text(), 10)).toBe(this.collection.unreadCount);
+ expect(parseInt(badge.text(), 10)).toBe(this.collection.unreadCount);
this.collection.unreadCount++;
this.view.updateView();
- expect(parseInt(badge1.text(), 10)).toBe(this.collection.unreadCount);
-
- this.view.updateView();
- expect(parseInt(badge2.text(), 10)).toBe(this.collection.unreadCount);
+ expect(parseInt(badge.text(), 10)).toBe(this.collection.unreadCount);
});
it("disables the mark-all-read-link button", function() {
diff --git a/spec/javascripts/app/views/preview_post_view_spec.js b/spec/javascripts/app/views/preview_post_view_spec.js
index e2c1b5aec..af5f0a455 100644
--- a/spec/javascripts/app/views/preview_post_view_spec.js
+++ b/spec/javascripts/app/views/preview_post_view_spec.js
@@ -36,12 +36,6 @@ describe("app.views.PreviewPost", function() {
});
describe("render", function() {
- it("calls feedbackView", function() {
- spyOn(app.views.PreviewPost.prototype, "feedbackView");
- this.view.render();
- expect(app.views.PreviewPost.prototype.feedbackView).toHaveBeenCalled();
- });
-
it("calls postContentView", function() {
spyOn(app.views.PreviewPost.prototype, "postContentView");
this.view.render();
@@ -55,14 +49,6 @@ describe("app.views.PreviewPost", function() {
});
});
- describe("feedbackView", function() {
- it("calls app.views.Feedback.initialise", function() {
- spyOn(app.views.Feedback.prototype, "initialize");
- this.view.feedbackView();
- expect(app.views.Feedback.prototype.initialize).toHaveBeenCalledWith({model: this.model});
- });
- });
-
describe("postContentView", function() {
it("calls app.views.Feedback.initialise", function() {
spyOn(app.views.StatusMessage.prototype, "initialize");
diff --git a/spec/javascripts/app/views/publisher_mention_view_spec.js b/spec/javascripts/app/views/publisher_mention_view_spec.js
index 7f5ced47c..15371a01f 100644
--- a/spec/javascripts/app/views/publisher_mention_view_spec.js
+++ b/spec/javascripts/app/views/publisher_mention_view_spec.js
@@ -7,7 +7,6 @@ describe("app.views.PublisherMention", function() {
it("initializes object properties", function() {
this.view = new app.views.PublisherMention({ el: "#publisher" });
expect(this.view.mentionedPeople).toEqual([]);
- expect(this.view.invisibleChar).toBe("\u200B");
expect(this.view.triggerChar).toBe("@");
});
@@ -29,6 +28,17 @@ describe("app.views.PublisherMention", function() {
});
});
+ describe("mentionSyntaxTemplate", function() {
+ beforeEach(function() {
+ this.view = new app.views.PublisherMention({el: "#publisher"});
+ this.person = {handle: "alice@pod.tld", name: "Alice Awesome"};
+ });
+
+ it("returns the correct mention syntax", function() {
+ expect(this.view.mentionSyntaxTemplate(this.person)).toBe("@{alice@pod.tld}");
+ });
+ });
+
describe("bindTypeaheadEvents", function() {
beforeEach(function() {
this.view = new app.views.PublisherMention({ el: "#publisher" });
@@ -92,30 +102,30 @@ describe("app.views.PublisherMention", function() {
});
it("removes person from mentioned people if not mentioned anymore", function() {
- this.view.addPersonToMentions({name: "user1", handle: "user1@pod.tld"});
+ this.view.addPersonToMentions({name: "User Name", handle: "user1@pod.tld"});
expect(this.view.mentionedPeople.length).toBe(1);
this.view.cleanMentionedPeople();
expect(this.view.mentionedPeople.length).toBe(0);
});
it("removes person from ignored people if not mentioned anymore", function() {
- this.view.addPersonToMentions({name: "user1", handle: "user1@pod.tld"});
+ this.view.addPersonToMentions({name: "User Name", handle: "user1@pod.tld"});
expect(this.view.ignoreDiasporaIds.length).toBe(1);
this.view.cleanMentionedPeople();
expect(this.view.ignoreDiasporaIds.length).toBe(0);
});
it("keeps mentioned persons", function() {
- this.view.addPersonToMentions({name: "user1", handle: "user1@pod.tld"});
- this.view.inputBox.val("user1");
+ this.view.addPersonToMentions({name: "User Name", handle: "user1@pod.tld"});
+ this.view.inputBox.val("@{user1@pod.tld}");
expect(this.view.mentionedPeople.length).toBe(1);
this.view.cleanMentionedPeople();
expect(this.view.mentionedPeople.length).toBe(1);
});
it("keeps mentioned persons for ignored diaspora ids", function() {
- this.view.addPersonToMentions({name: "user1", handle: "user1@pod.tld"});
- this.view.inputBox.val("user1");
+ this.view.addPersonToMentions({name: "User Name", handle: "user1@pod.tld"});
+ this.view.inputBox.val("@{user1@pod.tld}");
expect(this.view.ignoreDiasporaIds.length).toBe(1);
this.view.cleanMentionedPeople();
expect(this.view.ignoreDiasporaIds.length).toBe(1);
@@ -151,61 +161,29 @@ describe("app.views.PublisherMention", function() {
it("correctly formats the text", function() {
this.view.onSuggestionSelection({name: "user1337", handle: "user1@pod.tld"});
- expect(this.view.inputBox.val()).toBe("@user1337 Text before \u200Buser1337 text after");
+ expect(this.view.inputBox.val()).toBe("@user1337 Text before @{user1@pod.tld} text after");
});
it("replaces the correct mention", function() {
this.view.inputBox.val("@user1337 123 user2 @user2 456 @user3 789");
this.view.inputBox[0].setSelectionRange(26, 26);
this.view.onSuggestionSelection({name: "user23", handle: "user2@pod.tld"});
- expect(this.view.inputBox.val()).toBe("@user1337 123 user2 \u200Buser23 456 @user3 789");
+ expect(this.view.inputBox.val()).toBe("@user1337 123 user2 @{user2@pod.tld} 456 @user3 789");
this.view.inputBox[0].setSelectionRange(9, 9);
this.view.onSuggestionSelection({name: "user1337", handle: "user1@pod.tld"});
- expect(this.view.inputBox.val()).toBe("\u200Buser1337 123 user2 \u200Buser23 456 @user3 789");
- this.view.inputBox[0].setSelectionRange(38, 38);
+ expect(this.view.inputBox.val()).toBe("@{user1@pod.tld} 123 user2 @{user2@pod.tld} 456 @user3 789");
+ this.view.inputBox[0].setSelectionRange(54, 54);
this.view.onSuggestionSelection({name: "user32", handle: "user3@pod.tld"});
- expect(this.view.inputBox.val()).toBe("\u200Buser1337 123 user2 \u200Buser23 456 \u200Buser32 789");
- });
-
- it("calls updateMessageTexts", function() {
- spyOn(this.view, "updateMessageTexts");
- this.view.onSuggestionSelection({name: "user1337", handle: "user1@pod.tld"});
- expect(this.view.updateMessageTexts).toHaveBeenCalled();
+ expect(this.view.inputBox.val()).toBe("@{user1@pod.tld} 123 user2 @{user2@pod.tld} 456 @{user3@pod.tld} 789");
});
it("places the caret at the right position", function() {
this.view.onSuggestionSelection({"name": "user1WithLongName", "handle": "user1@pod.tld"});
- var expectedCaretPosition = ("@user1337 Text before \u200Buser1WithLongName").length;
+ var expectedCaretPosition = ("@user1337 Text before @{user1@pod.tld}").length;
expect(this.view.inputBox[0].selectionStart).toBe(expectedCaretPosition);
});
});
- describe("updateMessageTexts", function() {
- beforeEach(function() {
- this.view = new app.views.PublisherMention({ el: "#publisher" });
- this.view.inputBox.val("@user1 Text before \u200Buser1\ntext after");
- this.view.mentionedPeople.push({"name": "user1", "handle": "user1@pod.tld"});
- });
-
- it("sets the correct messageText", function() {
- this.view.updateMessageTexts();
- expect(this.view.inputBox.data("messageText")).toBe("@user1 Text before @{user1 ; user1@pod.tld}\ntext after");
- });
-
- it("formats overlay text to HTML", function() {
- this.view.updateMessageTexts();
- expect(this.view.mentionsBox.find(".mentions").html())
- .toBe("@user1 Text before user1\ntext after");
- });
-
- it("properly escapes the user input", function() {
- this.view.inputBox.val("![](\"/default.png\")
@user1 Text before \u200Buser1\ntext after");
- this.view.updateMessageTexts();
- expect(this.view.mentionsBox.find(".mentions").html())
- .toBe("<img src=\"/default.png\"> @user1 Text before user1\ntext after");
- });
- });
-
describe("updateTypeaheadInput", function() {
beforeEach(function() {
this.view = new app.views.PublisherMention({ el: "#publisher" });
@@ -251,20 +229,34 @@ describe("app.views.PublisherMention", function() {
expect(this.view.closeSuggestions).not.toHaveBeenCalled();
expect(this.view.typeaheadInput.val()).toBe("user");
});
+
+ it("doesn't call 'cleanMentionedPeople' if there is no '@' in front of the caret", function() {
+ spyOn(this.view, "cleanMentionedPeople");
+ this.view.inputBox.val("user1337 Text before @user1 text after");
+ this.view.inputBox[0].setSelectionRange(9, 9);
+ this.view.updateTypeaheadInput();
+ expect(this.view.cleanMentionedPeople).not.toHaveBeenCalled();
+ });
+
+ it("calls 'cleanMentionedPeople' if there is an '@' in front of the caret", function() {
+ spyOn(this.view, "cleanMentionedPeople");
+ this.view.inputBox.val("@user1337 Text before @user1 text after");
+ this.view.inputBox[0].setSelectionRange(9, 9);
+ this.view.updateTypeaheadInput();
+ expect(this.view.cleanMentionedPeople).toHaveBeenCalled();
+ });
});
describe("prefillMention", function() {
beforeEach(function() {
this.view = new app.views.PublisherMention({ el: "#publisher" });
spyOn(this.view, "addPersonToMentions");
- spyOn(this.view, "updateMessageTexts");
});
it("prefills one mention", function() {
this.view.prefillMention([{"name": "user1", "handle": "user1@pod.tld"}]);
expect(this.view.addPersonToMentions).toHaveBeenCalledWith({"name": "user1", "handle": "user1@pod.tld"});
- expect(this.view.updateMessageTexts).toHaveBeenCalled();
- expect(this.view.inputBox.val()).toBe("\u200Buser1");
+ expect(this.view.inputBox.val()).toBe("@{user1@pod.tld}");
});
it("prefills multiple mentions", function() {
@@ -275,8 +267,7 @@ describe("app.views.PublisherMention", function() {
expect(this.view.addPersonToMentions).toHaveBeenCalledWith({"name": "user1", "handle": "user1@pod.tld"});
expect(this.view.addPersonToMentions).toHaveBeenCalledWith({"name": "user2", "handle": "user2@pod.tld"});
- expect(this.view.updateMessageTexts).toHaveBeenCalled();
- expect(this.view.inputBox.val()).toBe("\u200Buser1 \u200Buser2");
+ expect(this.view.inputBox.val()).toBe("@{user1@pod.tld} @{user2@pod.tld}");
});
});
@@ -372,30 +363,6 @@ describe("app.views.PublisherMention", function() {
});
});
- describe("onInputBoxInput", function() {
- beforeEach(function() {
- this.view = new app.views.PublisherMention({ el: "#publisher" });
- });
-
- it("calls 'cleanMentionedPeople'", function() {
- spyOn(this.view, "cleanMentionedPeople");
- this.view.onInputBoxInput();
- expect(this.view.cleanMentionedPeople).toHaveBeenCalled();
- });
-
- it("calls 'updateMessageTexts'", function() {
- spyOn(this.view, "updateMessageTexts");
- this.view.onInputBoxInput();
- expect(this.view.updateMessageTexts).toHaveBeenCalled();
- });
-
- it("calls 'updateTypeaheadInput'", function() {
- spyOn(this.view, "updateTypeaheadInput");
- this.view.onInputBoxInput();
- expect(this.view.updateTypeaheadInput).toHaveBeenCalled();
- });
- });
-
describe("onInputBoxClick", function() {
beforeEach(function() {
this.view = new app.views.PublisherMention({ el: "#publisher" });
@@ -423,13 +390,13 @@ describe("app.views.PublisherMention", function() {
describe("reset", function() {
beforeEach(function() {
this.view = new app.views.PublisherMention({ el: "#publisher" });
- spyOn(this.view, "onInputBoxInput");
+ spyOn(this.view, "updateTypeaheadInput");
});
it("resets the mention box", function() {
this.view.reset();
expect(this.view.inputBox.val()).toBe("");
- expect(this.view.onInputBoxInput).toHaveBeenCalled();
+ expect(this.view.updateTypeaheadInput).toHaveBeenCalled();
});
});
@@ -454,27 +421,21 @@ describe("app.views.PublisherMention", function() {
});
});
- describe("getTextForSubmit", function() {
+ describe("getMentionedPeople", function() {
beforeEach(function() {
- this.view = new app.views.PublisherMention({ el: "#publisher" });
- this.view.bloodhound.add([
- {person: true, name: "user1", handle: "user1@pod.tld"}
- ]);
+ this.view = new app.views.PublisherMention({el: "#publisher"});
});
- it("returns text with mention if someone has been mentioned", function() {
- this.view.inputBox.val("@user");
- this.view.inputBox[0].setSelectionRange(5, 5);
- this.view.typeaheadInput.typeahead("val", "user");
- this.view.typeaheadInput.typeahead("open");
- this.view.$(".tt-suggestion").first().click();
- expect(this.view.getTextForSubmit()).toBe("@{user1 ; user1@pod.tld}");
+ it("calls 'cleanMentionedPeople'", function() {
+ spyOn(this.view, "cleanMentionedPeople");
+ this.view.getMentionedPeople();
+ expect(this.view.cleanMentionedPeople).toHaveBeenCalled();
});
- it("returns normal text if nobody has been mentioned", function() {
- this.view.inputBox.data("messageText", "Bad text");
- this.view.inputBox.val("Good text");
- expect(this.view.getTextForSubmit()).toBe("Good text");
+ it("returns the cleaned mentionedPeople", function() {
+ this.view.inputBox.val("@{user1@pod.tld} user2@pod.tld");
+ this.view.mentionedPeople = [{name: "user1", handle: "user1@pod.tld"}, {name: "user2", handle: "user2@pod.tld"}];
+ expect(this.view.getMentionedPeople()).toEqual([{name: "user1", handle: "user1@pod.tld"}]);
});
});
});
diff --git a/spec/javascripts/app/views/publisher_view_spec.js b/spec/javascripts/app/views/publisher_view_spec.js
index 2e7c3b4dd..1a8b4a3bf 100644
--- a/spec/javascripts/app/views/publisher_view_spec.js
+++ b/spec/javascripts/app/views/publisher_view_spec.js
@@ -43,17 +43,11 @@ describe("app.views.Publisher", function() {
});
describe("#initSubviews", function() {
- it("calls handleTextchange if the publisher is prefilled with mentions", function() {
- spyOn(this.view, "handleTextchange");
+ it("calls checkSubmitAvailability if the publisher is prefilled with mentions", function() {
+ spyOn(this.view, "checkSubmitAvailability");
this.view.prefillMention = "user@example.org";
this.view.initSubviews();
- expect(this.view.handleTextchange).toHaveBeenCalled();
- });
-
- it("doesn't call handleTextchange if there are no prefilled mentions", function() {
- spyOn(this.view, "handleTextchange");
- this.view.initSubviews();
- expect(this.view.handleTextchange).not.toHaveBeenCalled();
+ expect(this.view.checkSubmitAvailability).toHaveBeenCalled();
});
});
@@ -82,9 +76,9 @@ describe("app.views.Publisher", function() {
});
it("resets the element's height", function() {
- $(this.view.el).find("#status_message_fake_text").height(100);
+ $(this.view.el).find("#status_message_text").height(100);
this.view.close($.Event());
- expect($(this.view.el).find("#status_message_fake_text").attr("style")).not.toContain("height");
+ expect($(this.view.el).find("#status_message_text").attr("style")).not.toContain("height");
});
it("calls autosize.update", function() {
@@ -203,12 +197,6 @@ describe("app.views.Publisher", function() {
});
describe("createStatusMessage", function(){
- it("calls handleTextchange to complete missing mentions", function(){
- spyOn(this.view, "handleTextchange");
- this.view.createStatusMessage($.Event());
- expect(this.view.handleTextchange).toHaveBeenCalled();
- });
-
it("adds the status message to the stream", function() {
app.stream = { addNow: $.noop };
spyOn(app.stream, "addNow");
@@ -224,20 +212,10 @@ describe("app.views.Publisher", function() {
});
});
- describe("createPostPreview", function(){
- it("calls handleTextchange to complete missing mentions", function(){
- spyOn(this.view, "handleTextchange");
- this.view.createPostPreview();
- expect(this.view.handleTextchange).toHaveBeenCalled();
- });
- });
-
describe('#setText', function() {
it("sets the content text", function() {
this.view.setText("FOO bar");
-
expect(this.view.inputEl.val()).toEqual("FOO bar");
- expect(this.view.hiddenInputEl.val()).toEqual("FOO bar");
});
});
@@ -248,7 +226,6 @@ describe("app.views.Publisher", function() {
expect(this.view.disabled).toBeTruthy();
expect(this.view.inputEl.prop("disabled")).toBeTruthy();
- expect(this.view.hiddenInputEl.prop("disabled")).toBeTruthy();
});
it("disables submitting", function() {
@@ -273,6 +250,44 @@ describe("app.views.Publisher", function() {
expect(submitCallback).toHaveBeenCalled();
expect($(this.view.el)).not.toHaveClass("closed");
});
+
+ it("should submit the form when cmd+enter is pressed", function() {
+ this.view.render();
+ var form = this.view.$("form");
+ var submitCallback = jasmine.createSpy().and.returnValue(false);
+ form.submit(submitCallback);
+
+ var e = $.Event("keydown", {which: Keycodes.ENTER, metaKey: true});
+ this.view.keyDown(e);
+
+ expect(submitCallback).toHaveBeenCalled();
+ expect($(this.view.el)).not.toHaveClass("closed");
+ });
+ });
+
+ describe("tryClose", function() {
+ it("doesn't close the publisher if it is submittable", function() {
+ spyOn(this.view, "_submittable").and.returnValue(true);
+ spyOn(this.view, "close");
+ this.view.tryClose();
+ expect(this.view.close).not.toHaveBeenCalled();
+ });
+
+ it("doesn't close the publisher if it is in preview mode", function() {
+ spyOn(this.view, "_submittable").and.returnValue(false);
+ spyOn(this.view.markdownEditor, "isPreviewMode").and.returnValue(true);
+ spyOn(this.view, "close");
+ this.view.tryClose();
+ expect(this.view.close).not.toHaveBeenCalled();
+ });
+
+ it("closes the publisher if it is neither submittable nor in preview mode", function() {
+ spyOn(this.view, "_submittable").and.returnValue(false);
+ spyOn(this.view.markdownEditor, "isPreviewMode").and.returnValue(false);
+ spyOn(this.view, "close");
+ this.view.tryClose();
+ expect(this.view.close).toHaveBeenCalled();
+ });
});
describe("_beforeUnload", function(){
diff --git a/spec/javascripts/app/views/single-post-view/single_post_comment_stream_spec.js b/spec/javascripts/app/views/single-post-view/single_post_comment_stream_spec.js
index 3e32ca3ee..28c80225d 100644
--- a/spec/javascripts/app/views/single-post-view/single_post_comment_stream_spec.js
+++ b/spec/javascripts/app/views/single-post-view/single_post_comment_stream_spec.js
@@ -9,14 +9,6 @@ describe("app.views.SinglePostCommentStream", function() {
expect(this.view.CommentView).toBe(app.views.ExpandedComment);
});
- it("calls render when the comments collection has been resetted", function() {
- spyOn(app.views.SinglePostCommentStream.prototype, "render");
- this.view.initialize();
- expect(app.views.SinglePostCommentStream.prototype.render).not.toHaveBeenCalled();
- this.post.comments.reset();
- expect(app.views.SinglePostCommentStream.prototype.render).toHaveBeenCalled();
- });
-
it("calls setupBindings", function() {
spyOn(app.views.SinglePostCommentStream.prototype, "setupBindings");
this.view.initialize();
diff --git a/spec/javascripts/app/views/single-post-view/single_post_interaction_counts_spec.js b/spec/javascripts/app/views/single-post-view/single_post_interaction_counts_spec.js
index 35abf7afe..0ff6959bc 100644
--- a/spec/javascripts/app/views/single-post-view/single_post_interaction_counts_spec.js
+++ b/spec/javascripts/app/views/single-post-view/single_post_interaction_counts_spec.js
@@ -1,6 +1,6 @@
describe("app.views.SinglePostInteractionCounts", function() {
beforeEach(function() {
- this.post = factory.post();
+ this.post = factory.postWithInteractions();
this.view = new app.views.SinglePostInteractionCounts({model: this.post});
});
@@ -12,5 +12,151 @@ describe("app.views.SinglePostInteractionCounts", function() {
this.post.interactions.trigger("change");
expect(app.views.SinglePostInteractionCounts.prototype.render).toHaveBeenCalled();
});
+
+ it("calls render when the likes change", function() {
+ spyOn(app.views.SinglePostInteractionCounts.prototype, "render");
+ this.view.initialize();
+ expect(app.views.SinglePostInteractionCounts.prototype.render).not.toHaveBeenCalled();
+ this.post.interactions.likes.trigger("change");
+ expect(app.views.SinglePostInteractionCounts.prototype.render).toHaveBeenCalled();
+ });
+
+ it("calls render when the reshares change", function() {
+ spyOn(app.views.SinglePostInteractionCounts.prototype, "render");
+ this.view.initialize();
+ expect(app.views.SinglePostInteractionCounts.prototype.render).not.toHaveBeenCalled();
+ this.post.interactions.reshares.trigger("change");
+ expect(app.views.SinglePostInteractionCounts.prototype.render).toHaveBeenCalled();
+ });
+ });
+
+ describe("render", function() {
+ it("doesn't show a #show-all-likes link if there are no additional likes", function() {
+ this.view.render();
+ expect(this.view.$("#show-all-likes").length).toBe(0);
+ });
+
+ it("shows a #show-all-likes link if there are additional likes", function() {
+ this.view.model.interactions.set("likes_count", this.view.model.interactions.likes.length + 1);
+ this.view.render();
+ expect(this.view.$("#show-all-likes").length).toBe(1);
+ });
+
+ it("doesn't show a #show-all-reshares link if there are no additional reshares", function() {
+ this.view.render();
+ expect(this.view.$("#show-all-reshares").length).toBe(0);
+ });
+
+ it("shows a #show-all-reshares link if there are additional reshares", function() {
+ this.view.model.interactions.set("reshares_count", this.view.model.interactions.reshares.length + 1);
+ this.view.render();
+ expect(this.view.$("#show-all-reshares").length).toBe(1);
+ });
+ });
+
+ describe("showAllLikes", function() {
+ it("is called when clicking #show-all-likes", function() {
+ spyOn(this.view, "showAllLikes");
+ this.view.delegateEvents();
+ this.view.model.interactions.set("likes_count", this.view.model.interactions.likes.length + 1);
+ this.view.render();
+ expect(this.view.showAllLikes).not.toHaveBeenCalled();
+ this.view.$("#show-all-likes").click();
+ expect(this.view.showAllLikes).toHaveBeenCalled();
+ });
+
+ it("calls _showAll", function() {
+ spyOn(this.view, "_showAll");
+ this.view.showAllLikes($.Event());
+ expect(this.view._showAll).toHaveBeenCalledWith("likes", this.view.model.interactions.likes);
+ });
+ });
+
+ describe("showAllReshares", function() {
+ it("is called when clicking #show-all-reshares", function() {
+ spyOn(this.view, "showAllReshares");
+ this.view.delegateEvents();
+ this.view.model.interactions.set("reshares_count", this.view.model.interactions.reshares.length + 1);
+ this.view.render();
+ expect(this.view.showAllReshares).not.toHaveBeenCalled();
+ this.view.$("#show-all-reshares").click();
+ expect(this.view.showAllReshares).toHaveBeenCalled();
+ });
+
+ it("calls _showAll", function() {
+ spyOn(this.view, "_showAll");
+ this.view.showAllReshares($.Event());
+ expect(this.view._showAll).toHaveBeenCalledWith("reshares", this.view.model.interactions.reshares);
+ });
+ });
+
+ describe("_showAll", function() {
+ beforeEach(function() {
+ this.view.model.interactions.set("likes_count", this.view.model.interactions.likes.length + 1);
+ this.view.model.interactions.set("reshares_count", this.view.model.interactions.reshares.length + 1);
+ this.view.render();
+ });
+
+ context("with likes", function() {
+ it("hides the #show-all-likes link", function() {
+ expect(this.view.$("#show-all-likes")).not.toHaveClass("hidden");
+ expect(this.view.$("#show-all-reshares")).not.toHaveClass("hidden");
+ this.view._showAll("likes", this.view.model.interactions.likes);
+ expect(this.view.$("#show-all-likes")).toHaveClass("hidden");
+ expect(this.view.$("#show-all-reshares")).not.toHaveClass("hidden");
+ });
+
+ it("shows the likes loader", function() {
+ expect(this.view.$("#likes .loader")).toHaveClass("hidden");
+ expect(this.view.$("#reshares .loader")).toHaveClass("hidden");
+ this.view._showAll("likes", this.view.model.interactions.likes);
+ expect(this.view.$("#likes .loader")).not.toHaveClass("hidden");
+ expect(this.view.$("#reshares .loader")).toHaveClass("hidden");
+ });
+
+ it("calls #fetch on the model", function() {
+ spyOn(this.view.model.interactions.likes, "fetch");
+ this.view._showAll("likes", this.view.model.interactions.likes);
+ expect(this.view.model.interactions.likes.fetch).toHaveBeenCalled();
+ });
+
+ it("triggers 'change' after a successfull fetch", function() {
+ spyOn(this.view.model.interactions.likes, "trigger");
+ this.view._showAll("likes", this.view.model.interactions.likes);
+ jasmine.Ajax.requests.mostRecent().respondWith({status: 200, responseText: "{\"id\": 1}"});
+ expect(this.view.model.interactions.likes.trigger).toHaveBeenCalledWith("change");
+ });
+ });
+
+ context("with reshares", function() {
+ it("hides the #show-all-reshares link", function() {
+ expect(this.view.$("#show-all-likes")).not.toHaveClass("hidden");
+ expect(this.view.$("#show-all-reshares")).not.toHaveClass("hidden");
+ this.view._showAll("reshares", this.view.model.interactions.reshares);
+ expect(this.view.$("#show-all-likes")).not.toHaveClass("hidden");
+ expect(this.view.$("#show-all-reshares")).toHaveClass("hidden");
+ });
+
+ it("shows the reshares loader", function() {
+ expect(this.view.$("#likes .loader")).toHaveClass("hidden");
+ expect(this.view.$("#reshares .loader")).toHaveClass("hidden");
+ this.view._showAll("reshares", this.view.model.interactions.reshares);
+ expect(this.view.$("#likes .loader")).toHaveClass("hidden");
+ expect(this.view.$("#reshares .loader")).not.toHaveClass("hidden");
+ });
+
+ it("calls #fetch on the model", function() {
+ spyOn(this.view.model.interactions.reshares, "fetch");
+ this.view._showAll("reshares", this.view.model.interactions.reshares);
+ expect(this.view.model.interactions.reshares.fetch).toHaveBeenCalled();
+ });
+
+ it("triggers 'change' after a successfull fetch", function() {
+ spyOn(this.view.model.interactions.reshares, "trigger");
+ this.view._showAll("reshares", this.view.model.interactions.reshares);
+ jasmine.Ajax.requests.mostRecent().respondWith({status: 200, responseText: "{\"id\": 1}"});
+ expect(this.view.model.interactions.reshares.trigger).toHaveBeenCalledWith("change");
+ });
+ });
});
});
diff --git a/spec/javascripts/helpers/markdown_editor_spec.js b/spec/javascripts/helpers/markdown_editor_spec.js
index 9c2ab4cff..55bc68942 100644
--- a/spec/javascripts/helpers/markdown_editor_spec.js
+++ b/spec/javascripts/helpers/markdown_editor_spec.js
@@ -31,6 +31,7 @@ describe("Diaspora.MarkdownEditor", function() {
it("call $.fn.markdown with correct default options", function() {
spyOn($.fn, "markdown");
+ spyOn(autosize, "update");
this.target.initialize(this.$el, {});
expect($.fn.markdown).toHaveBeenCalled();
var args = $.fn.markdown.calls.mostRecent().args[0];
@@ -40,6 +41,9 @@ describe("Diaspora.MarkdownEditor", function() {
expect(args.onPostPreview).toBe($.noop);
expect(args.fullscreen).toEqual({enable: false, icons: {}});
expect(args.hiddenButtons).toEqual(["cmdPreview"]);
+
+ args.onChange({$textarea: "el"});
+ expect(autosize.update).toHaveBeenCalledWith("el");
});
it("overrides fullscreen, hiddenButtons, language and onShow options", function() {
@@ -220,6 +224,48 @@ describe("Diaspora.MarkdownEditor", function() {
});
});
+ describe("isPreviewMode", function() {
+ beforeEach(function() {
+ this.target = new Diaspora.MarkdownEditor(this.$el, {onPreview: $.noop, onPostPreview: $.noop()});
+ });
+
+ it("return false if editor is not visible yet", function() {
+ this.target.instance = undefined;
+ expect(this.target.isPreviewMode()).toBe(false);
+ });
+
+ it("returns false if the editor is in write (default) mode", function() {
+ expect(this.target.instance).toBeDefined();
+ expect(this.target.isPreviewMode()).toBe(false);
+ });
+
+ it("returns true if editor is in preview mode", function() {
+ this.target.showPreview();
+ expect(this.target.isPreviewMode()).toBe(true);
+ });
+ });
+
+ describe("userInputEmpty", function() {
+ beforeEach(function() {
+ this.target = new Diaspora.MarkdownEditor(this.$el, {onPreview: $.noop, onPostPreview: $.noop()});
+ });
+
+ it("return true if editor is not visible yet", function() {
+ this.target.instance = undefined;
+ expect(this.target.userInputEmpty()).toBe(true);
+ });
+
+ it("returns true if editor has no content", function() {
+ $("textarea").text("");
+ expect(this.target.userInputEmpty()).toBe(true);
+ });
+
+ it("returns false if editor has content", function() {
+ $("textarea").text("Yolo");
+ expect(this.target.userInputEmpty()).toBe(false);
+ });
+ });
+
describe("localize", function() {
beforeEach(function() {
this.target = new Diaspora.MarkdownEditor(this.$el, {});
@@ -234,4 +280,18 @@ describe("Diaspora.MarkdownEditor", function() {
expect($.fn.markdown.messages[Diaspora.I18n.language]).toBeDefined();
});
});
+
+ describe("simplePreview", function() {
+ beforeEach(function() {
+ this.target = new Diaspora.MarkdownEditor(this.$el, {});
+ });
+
+ it("generates HTML for preview", function() {
+ spyOn(app.helpers, "textFormatter").and.callThrough();
+ this.$el[0].value = "hello
"; + var res = Diaspora.MarkdownEditor.simplePreview(this.target.instance); + expect(app.helpers.textFormatter).toHaveBeenCalledWith("hello
"); + expect(res).toBe("hello