harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add an encoding type to formatted zot communication structures so that we can later add alternate encodings.

Browse Source
This commit is contained in:
friendica 2014-07-24 15:55:01 -07:00
parent 0f14dd30db
commit 5a5190f2ff
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dir_fns.php
View File

@ -185,6 +185,7 @@ function local_dir_update($uid,$force) {
); );
$profile = array(); $profile = array();
$profile['encoding'] = 'zot';
if($p) { if($p) {
$hash = $p[0]['channel_hash']; $hash = $p[0]['channel_hash'];

2
include/items.php
View File

@ -838,6 +838,7 @@ function import_author_rss($x) {
function encode_item($item) { function encode_item($item) {
$x = array(); $x = array();
$x['type'] = 'activity'; $x['type'] = 'activity';
$x['encoding'] = 'zot';
// logger('encode_item: ' . print_r($item,true)); // logger('encode_item: ' . print_r($item,true));
@ -1069,6 +1070,7 @@ function encode_item_flags($item) {
function encode_mail($item) { function encode_mail($item) {
$x = array(); $x = array();
$x['type'] = 'mail'; $x['type'] = 'mail';
$x['encoding'] = 'zot';
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) { if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
$key = get_config('system','prvkey'); $key = get_config('system','prvkey');

6
include/zot.php
View File

@ -1648,11 +1648,6 @@ function delete_imported_item($sender,$item,$uid) {
require_once('include/items.php'); require_once('include/items.php');
// FIXME issue #230 is related
// Chicken/egg problem because we have to drop_item, but this removes information that tag_deliver may need to do its stuff.
// We can't reverse the order because drop_item refuses to run if the item already has the deleted flag set and we need to
// set that flag prior to calling tag_deliver.
// Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels // Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels
// and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2). // and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2).
@ -2104,6 +2099,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
$info = (($packet) ? $packet : array()); $info = (($packet) ? $packet : array());
$info['type'] = 'channel_sync'; $info['type'] = 'channel_sync';
$info['encoding'] = 'red'; // note: not zot, this packet is very red specific
if(array_key_exists($uid,$a->config) && array_key_exists('transient',$a->config[$uid])) { if(array_key_exists($uid,$a->config) && array_key_exists('transient',$a->config[$uid])) {
$settings = $a->config[$uid]['transient']; $settings = $a->config[$uid]['transient'];

2
version.inc
View File

@ -1 +1 @@
2014-07-23.745 2014-07-24.746