Time delays for Activity2 activity recording

I did actually think about that second point you made when I was writing that, I'll have a look at getting it fixed and sort the table issue with the queries.

In terms of the sharing with the variable_get... I take it I was going down the right path with that and I'd just need to add in different variables to each .activity.inc file and update the admin with the extra settings, probably need to add another for user updates while I am at it.

For the last part I think that the global user thing is a good idea in general so I'd be happy enough to keep using hooks for profiles for now.

What I really need are 2 different templates for recording activity (or a conditional one) when updating nodes based on global user and the node author, so lets say User X is the global user then I would to be able to say:

"User X updated their profile"
..
and
..
"User X updated User Y's profile"

and then I could always use the global user and completely forget about the node author.

I don't think conditional templates are possible at the moment (unless I missed something) so I'm stuck with having to hook_alter that uid to force it to use node author for profile nodes and just say:

"User Y's profile was updated"

where User Y is node author regardless of the user performing the activity.

Just had a bit of a play with the query to make it do the math... changed the query to:

/**
 * Implementation of hook_activity_type_check().
 */
function node_activity_type_check($token_objects, $types) {
  // Don't want to log an activity too soon after the node was first created
  $updating_old = ($token_objects['node']->changed - $token_objects['node']->created > variable_get('activity_first_update_delay', 0));
  
  $update_delay = db_query("SELECT aid FROM {activity} WHERE nid = %d AND op = 'update' AND uid = %d AND created > %d ORDER BY created DESC LIMIT 1", $token_objects['node']->nid, $token_objects['user']->uid, $token_objects['node']->changed - variable_get('activity_delay_between_updates', 0));
  
  return (in_array($token_objects['node']->type, $types) && ($token_objects['node']->is_new || ($updating_old && db_affected_rows($update_delay) == 0));
}

but the the thing is.... I still have to do a db_affected_rows() on this to then check that there are zero affected rows. I know that this is better than a db_fetch_array() but I'm just worried about that db_affected_rows()... from what I've found everyone says to stay away from using affected_rows() with a resource from a SELECT and that it should only be used with INSERT,UPDATE or DELETE. There used to be a db_num_rows() in D5 but it was stripped for D6 given that it wasn't compatible with Postgre.... any thoughts? Am I barking up the wrong tree with that method?

Thanks for that. It is working now with nodes and comments having separate settings in the admin, but I'm having an issue with user related activity.

I placed a drupal_set_message() in user_activity_type_check() and it wasn't firing so I modified activity.module and changed the code in activity_record_check() from this:

if (!empty($types)) {
  return module_invoke(activity_module_name($context['hook']), 'activity_type_check', $token_objects, $types);
}

to this:

if (!empty($types)) {
  drupal_set_message('Calling ' . $context['hook'] . ' activity type check');
  return module_invoke(activity_module_name($context['hook']), 'activity_type_check', $token_objects, $types);
}
else {
  drupal_set_message('Never called ' . $context['hook'] . ' activity type check');
}

and it is catching in the else so user_activity_type_check() is never being called.... ever! Is this a bug?

I thought that $types contained activity types, so things like insert, update, delete, view... am I wrong?

Damn.... just realised something. This global user thing is going to have an impact on the user related activity. It will store the uid as the logged in user's id and then the activity row in the DB won't include any id related to the user the activity was performed on.

In order to get the time delays working with user account updates user_activity_type_check() needs to check the uid on the activity to see when the last update was and it won't see the account's uid to allow for the delay.

For now I'm going to do another alter in my mods module to keep the author for user related activity as well as content profile nodes.

This might be a huge pain but it might be better if Activity could record 2 ids, one for the author/user and one for the actor. This would help with other things like views, but it might be a lot of work...

Finally got around to getting the new version of the patch updated. Done a bit of testing and it seems to be working, just need a few more people to review to make sure.

The admin settings now have independent time delays for user/comment/node activities.

That sounds like a much better plan. I'll try and get a look at this again when I get time.