| @@ -113,17 +113,8 @@ | ||
| 113 | 113 | 'activitypub_activities' |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | 116 | add_settings_field( |
| 117 | - 'activitypub_default_quote_policy', | |
| 118 | - __( 'Default quote policy', 'activitypub' ), | |
| 119 | - array( self::class, 'render_default_quote_policy_field' ), | |
| 120 | - 'activitypub_settings', | |
| 121 | - 'activitypub_activities', | |
| 122 | - array( 'label_for' => 'activitypub_default_quote_policy' ) | |
| 123 | - ); | |
| 124 | - | |
| 125 | - add_settings_field( | |
| 126 | 117 | 'activitypub_use_hashtags', |
| 127 | 118 | __( 'Hashtags', 'activitypub' ), |
| 128 | 119 | array( self::class, 'render_use_hashtags_field' ), |
| 129 | 120 | 'activitypub_settings', |
| @@ -250,29 +241,8 @@ | ||
| 250 | 241 | /** |
| 251 | 242 | * Render custom post content field. |
| 252 | 243 | */ |
| 253 | 244 | public static function render_custom_post_content_field() { |
| 254 | - $switch_url = \wp_nonce_url( | |
| 255 | - \add_query_arg( | |
| 256 | - array( | |
| 257 | - 'page' => 'activitypub', | |
| 258 | - 'tab' => 'settings', | |
| 259 | - 'activitypub_update_object_type' => '1', | |
| 260 | - ), | |
| 261 | - \admin_url( 'options-general.php' ) | |
| 262 | - ), | |
| 263 | - 'activitypub_switch_object_type' | |
| 264 | - ); | |
| 265 | - ?> | |
| 266 | - <p class="description"> | |
| 267 | - <?php \esc_html_e( '⚠ You are using the legacy template system to format your posts for the fediverse. We recommend switching to automatic mode, which intelligently chooses the best format for each post. Switching will remove this template field from the settings.', 'activitypub' ); ?> | |
| 268 | - </p> | |
| 269 | - <p> | |
| 270 | - <a href="<?php echo \esc_url( $switch_url ); ?>" class="button"> | |
| 271 | - <?php \esc_html_e( 'Switch to Automatic Mode', 'activitypub' ); ?> | |
| 272 | - </a> | |
| 273 | - </p> | |
| 274 | - <?php | |
| 275 | 245 | $value = get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT ); |
| 276 | 246 | ?> |
| 277 | 247 | <p> |
| 278 | 248 | <textarea id="activitypub_custom_post_content" name="activitypub_custom_post_content" rows="10" cols="50" class="large-text" placeholder="<?php echo esc_attr( ACTIVITYPUB_CUSTOM_POST_CONTENT ); ?>"><?php echo esc_textarea( wp_kses( $value, 'post' ) ); ?></textarea> |
| @@ -382,29 +352,12 @@ | ||
| 382 | 352 | <?php |
| 383 | 353 | } |
| 384 | 354 | |
| 385 | 355 | /** |
| 386 | - * Render default quote policy field. | |
| 387 | - */ | |
| 388 | - public static function render_default_quote_policy_field() { | |
| 389 | - $value = get_option( 'activitypub_default_quote_policy', ACTIVITYPUB_INTERACTION_POLICY_ANYONE ); | |
| 390 | - ?> | |
| 391 | - <select id="activitypub_default_quote_policy" name="activitypub_default_quote_policy" class="regular-text"> | |
| 392 | - <option value="<?php echo esc_attr( ACTIVITYPUB_INTERACTION_POLICY_ANYONE ); ?>" <?php selected( $value, ACTIVITYPUB_INTERACTION_POLICY_ANYONE ); ?>><?php esc_html_e( 'Anyone', 'activitypub' ); ?></option> | |
| 393 | - <option value="<?php echo esc_attr( ACTIVITYPUB_INTERACTION_POLICY_FOLLOWERS ); ?>" <?php selected( $value, ACTIVITYPUB_INTERACTION_POLICY_FOLLOWERS ); ?>><?php esc_html_e( 'Followers only', 'activitypub' ); ?></option> | |
| 394 | - <option value="<?php echo esc_attr( ACTIVITYPUB_INTERACTION_POLICY_ME ); ?>" <?php selected( $value, ACTIVITYPUB_INTERACTION_POLICY_ME ); ?>><?php esc_html_e( 'Just me', 'activitypub' ); ?></option> | |
| 395 | - </select> | |
| 396 | - <p class="description"> | |
| 397 | - <?php esc_html_e( 'Default setting for who can quote new posts. This can be overridden per post.', 'activitypub' ); ?> | |
| 398 | - </p> | |
| 399 | - <?php | |
| 400 | - } | |
| 401 | - | |
| 402 | - /** | |
| 403 | 356 | * Render use hashtags field. |
| 404 | 357 | */ |
| 405 | 358 | public static function render_use_hashtags_field() { |
| 406 | - $value = get_option( 'activitypub_use_hashtags', '0' ); | |
| 359 | + $value = get_option( 'activitypub_use_hashtags', '1' ); | |
| 407 | 360 | ?> |
| 408 | 361 | <p> |
| 409 | 362 | <label> |
| 410 | 363 | <input type="checkbox" id="activitypub_use_hashtags" name="activitypub_use_hashtags" value="1" <?php checked( '1', $value ); ?> /> |